Merge remote branch 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 9 Nov 2010 23:15:32 +0000 (12:15 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 9 Nov 2010 23:15:32 +0000 (12:15 +1300)

Trivial merge