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

Trivial merge