Merge remote branch 'kc/new/bug_5446' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 19 Dec 2010 08:26:06 +0000 (21:26 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 19 Dec 2010 08:26:06 +0000 (21:26 +1300)

Trivial merge