Merge remote branch 'kc/new/bug_5563' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 3 Jan 2011 09:03:28 +0000 (22:03 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 3 Jan 2011 09:03:28 +0000 (22:03 +1300)

Trivial merge