Merge remote branch 'kc/new/enh/bug_4866' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 15 Nov 2010 08:34:39 +0000 (21:34 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 15 Nov 2010 08:34:39 +0000 (21:34 +1300)

Trivial merge