Merge remote branch 'kc/new/enh/bug_5848' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 17 Mar 2011 21:46:01 +0000 (10:46 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 17 Mar 2011 21:46:01 +0000 (10:46 +1300)

Trivial merge