Merge remote branch 'kc/new/enh/bug_5489' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 21 Dec 2010 08:43:51 +0000 (21:43 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 21 Dec 2010 08:43:51 +0000 (21:43 +1300)

Trivial merge