Merge remote branch 'kc/new/bug_1953' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 19:45:05 +0000 (08:45 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 19:45:05 +0000 (08:45 +1300)

Trivial merge