Merge remote-tracking branch 'kc/new/bug_7060' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 21 Oct 2011 15:09:49 +0000 (04:09 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 21 Oct 2011 15:09:49 +0000 (04:09 +1300)

Trivial merge