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

Trivial merge