Merge remote branch 'kc/new/enh/bug_5547' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 7 Apr 2011 20:39:14 +0000 (08:39 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 7 Apr 2011 20:39:14 +0000 (08:39 +1200)

Trivial merge