Merge remote branch 'kc/new/enh/bug_5839' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 5 Apr 2011 02:50:58 +0000 (14:50 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 5 Apr 2011 02:50:58 +0000 (14:50 +1200)

Trivial merge