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

Trivial merge