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

Trivial merge