Merge branch 'release-0.10'
authorAndrew Ruthven <andrew@etc.gen.nz>
Tue, 29 Jan 2013 03:46:05 +0000 (16:46 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Tue, 29 Jan 2013 03:46:05 +0000 (16:46 +1300)

Trivial merge