Merge remote branch 'kc/new/bug_4263' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Feb 2011 20:08:18 +0000 (09:08 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Feb 2011 20:08:18 +0000 (09:08 +1300)

Trivial merge