Merge remote branch 'kc/new/bug_5940' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 30 Mar 2011 06:40:47 +0000 (19:40 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 30 Mar 2011 06:40:47 +0000 (19:40 +1300)

Trivial merge