Merge remote branch 'kc/new/enh/bug_5283' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 19 Dec 2010 21:44:03 +0000 (10:44 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 19 Dec 2010 21:44:03 +0000 (10:44 +1300)

Trivial merge