Merge remote branch 'kc/new/bug_5370' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 7 Nov 2010 20:42:52 +0000 (09:42 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 7 Nov 2010 20:42:52 +0000 (09:42 +1300)

Trivial merge