Merge remote branch 'kc/new/enh/bug_5462' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 8 Feb 2011 08:05:14 +0000 (21:05 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 8 Feb 2011 08:05:14 +0000 (21:05 +1300)

Trivial merge