Merge branch 'development' v0.4.0.beta6
authorBradley Ayers <bradley.ayers@gmail.com>
Fri, 15 Apr 2011 10:57:22 +0000 (20:57 +1000)
committerBradley Ayers <bradley.ayers@gmail.com>
Fri, 15 Apr 2011 10:57:22 +0000 (20:57 +1000)

Trivial merge