Merge remote branch 'kc/new/enh/bug_5783' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 7 Mar 2011 02:10:37 +0000 (15:10 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 7 Mar 2011 02:10:37 +0000 (15:10 +1300)

Trivial merge