Merge remote branch 'kc/new/enh/bug_4820' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 7 Jan 2011 01:27:06 +0000 (14:27 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 7 Jan 2011 01:27:06 +0000 (14:27 +1300)

Trivial merge