Merge remote branch 'kc/new/bug_5234' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 8 Apr 2011 22:22:46 +0000 (10:22 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 8 Apr 2011 22:22:46 +0000 (10:22 +1200)

Trivial merge