Merge remote branch 'kc/new/enh/bug_5462' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 16 Feb 2011 19:56:43 +0000 (08:56 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 16 Feb 2011 19:56:43 +0000 (08:56 +1300)

Trivial merge