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

Trivial merge