Merge branch 'v0.4'
authorRyan Dahl <ry@tinyclouds.org>
Fri, 18 Feb 2011 22:01:34 +0000 (14:01 -0800)
committerRyan Dahl <ry@tinyclouds.org>
Fri, 18 Feb 2011 22:01:34 +0000 (14:01 -0800)

Trivial merge