Merge branch 'development' v0.4.2
authorBradley Ayers <bradley.ayers@gmail.com>
Wed, 11 May 2011 21:22:14 +0000 (07:22 +1000)
committerBradley Ayers <bradley.ayers@gmail.com>
Wed, 11 May 2011 21:22:14 +0000 (07:22 +1000)

Trivial merge