Merge remote branch 'kc/new/bug_5381' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 14 Nov 2010 09:27:33 +0000 (22:27 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 14 Nov 2010 09:27:33 +0000 (22:27 +1300)

Trivial merge