Merge remote branch 'kc/new/enh/bug_5917' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 12 Apr 2011 20:35:41 +0000 (08:35 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 12 Apr 2011 20:35:41 +0000 (08:35 +1200)

Trivial merge