Merge remote branch 'kc/new/enh/bug_1883' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 20:50:14 +0000 (09:50 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 20:50:14 +0000 (09:50 +1300)

Trivial merge