Merge remote branch 'kc/new/bug_3013' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Mar 2011 01:02:06 +0000 (14:02 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Mar 2011 01:02:06 +0000 (14:02 +1300)

Trivial merge