Merge remote branch 'kc/new/bug5075' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 30 Oct 2010 07:32:45 +0000 (20:32 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 30 Oct 2010 07:32:45 +0000 (20:32 +1300)

Trivial merge