Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 1 Sep 2011 09:28:41 +0000 (21:28 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 1 Sep 2011 09:28:41 +0000 (21:28 +1200)

Trivial merge