Merge remote branch 'kc/new/enh/bug_1997' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 13 Dec 2010 07:04:11 +0000 (20:04 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 13 Dec 2010 07:04:11 +0000 (20:04 +1300)

Trivial merge