Merge remote branch 'kc/new/enh/bug_4983' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 2 Dec 2010 23:55:25 +0000 (12:55 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 2 Dec 2010 23:55:25 +0000 (12:55 +1300)

Trivial merge