Merge branch 'development' v0.6.0
authorBradley Ayers <bradley.ayers@enigmainteractive.com>
Mon, 20 Jun 2011 05:51:14 +0000 (15:51 +1000)
committerBradley Ayers <bradley.ayers@enigmainteractive.com>
Mon, 20 Jun 2011 05:51:14 +0000 (15:51 +1000)

Trivial merge