Merge branch 'development' v0.5.1
authorBradley Ayers <bradley.ayers@gmail.com>
Tue, 7 Jun 2011 11:42:10 +0000 (21:42 +1000)
committerBradley Ayers <bradley.ayers@gmail.com>
Tue, 7 Jun 2011 11:42:10 +0000 (21:42 +1000)

Trivial merge