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

Trivial merge