Merge remote branch 'kc/new/bug_5240' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 9 Jan 2011 20:16:50 +0000 (09:16 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 9 Jan 2011 20:16:50 +0000 (09:16 +1300)

Trivial merge