Merge remote branch 'kc/new/bug_5682' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 17 Feb 2011 21:42:28 +0000 (10:42 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 17 Feb 2011 21:42:28 +0000 (10:42 +1300)

Trivial merge