Merge remote-tracking branch 'kc/new/bug_6476' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 16 Jul 2011 08:21:47 +0000 (20:21 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 16 Jul 2011 08:21:47 +0000 (20:21 +1200)

Trivial merge