Merge branch 'v0.4'
authorRyan Dahl <ry@tinyclouds.org>
Thu, 19 May 2011 17:34:42 +0000 (10:34 -0700)
committerRyan Dahl <ry@tinyclouds.org>
Thu, 19 May 2011 17:34:42 +0000 (10:34 -0700)

Trivial merge