Merge remote branch 'kc/new/bug_5175' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 20 Nov 2010 21:44:16 +0000 (10:44 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 20 Nov 2010 21:44:16 +0000 (10:44 +1300)

Trivial merge