Merge remote branch 'kc/new/enh/bug_5430' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 29 Nov 2010 18:02:18 +0000 (07:02 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 29 Nov 2010 18:02:18 +0000 (07:02 +1300)

Trivial merge