Merge remote branch 'kc/new/bug_4935' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 12 Dec 2010 08:08:19 +0000 (21:08 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 12 Dec 2010 08:08:19 +0000 (21:08 +1300)

Trivial merge