Merge remote branch 'kc/new/bug_3072' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 19 Apr 2011 01:03:07 +0000 (13:03 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 19 Apr 2011 01:03:07 +0000 (13:03 +1200)

Trivial merge