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

Trivial merge