Merge remote branch 'kc/new/bug_5308' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 3 Nov 2010 03:52:21 +0000 (16:52 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 3 Nov 2010 03:52:21 +0000 (16:52 +1300)

Trivial merge