Merge remote branch 'kc/new/bug_5162' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 2 Nov 2010 01:41:07 +0000 (14:41 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 2 Nov 2010 01:41:07 +0000 (14:41 +1300)

Trivial merge