Merge remote branch 'kc/new/enh/bug_4473' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 20 Dec 2010 19:34:51 +0000 (08:34 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 20 Dec 2010 19:34:51 +0000 (08:34 +1300)

Trivial merge