Merge commit 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 3 Jun 2010 02:11:49 +0000 (14:11 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 3 Jun 2010 02:11:49 +0000 (14:11 +1200)

Trivial merge