Merge remote branch 'kc/new/enh/bug_6143' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 28 Apr 2011 20:55:19 +0000 (08:55 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 28 Apr 2011 20:55:19 +0000 (08:55 +1200)

Trivial merge