Merge remote branch 'kc/new/bug_4305' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 21:47:38 +0000 (10:47 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 21:47:38 +0000 (10:47 +1300)

Trivial merge