Merge remote branch 'kc/new/enh/bug_5792' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 3 Mar 2011 23:54:59 +0000 (12:54 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 3 Mar 2011 23:54:59 +0000 (12:54 +1300)

Trivial merge