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

Trivial merge