Merge remote branch 'kc/new/bug_5281' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 29 Nov 2010 19:17:40 +0000 (08:17 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 29 Nov 2010 19:17:40 +0000 (08:17 +1300)

Trivial merge