Merge remote branch 'kc/new/enh/bug_3550' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Feb 2011 19:37:34 +0000 (08:37 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Feb 2011 19:37:34 +0000 (08:37 +1300)

Trivial merge