Merge remote branch 'kc/new/bug_5734' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Feb 2011 21:53:17 +0000 (10:53 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Feb 2011 21:53:17 +0000 (10:53 +1300)

Trivial merge