Merge branch 'new/bug_6479' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 2 Sep 2011 18:35:17 +0000 (06:35 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 2 Sep 2011 18:35:17 +0000 (06:35 +1200)

Trivial merge