Merge remote branch 'kc/new/bug_5651' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:34:56 +0000 (15:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:34:56 +0000 (15:34 +1200)

Trivial merge