Merge branch 'release-0.10'
authorAndrew Ruthven <andrew@etc.gen.nz>
Sat, 9 Feb 2013 11:04:04 +0000 (00:04 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Sat, 9 Feb 2013 11:04:04 +0000 (00:04 +1300)

Trivial merge