Merge remote branch 'kc/new/enh/bug_6033' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 28 Apr 2011 21:34:58 +0000 (09:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 28 Apr 2011 21:34:58 +0000 (09:34 +1200)

Trivial merge