Merge branch 'v8-3.1' into v0.4
authorRyan Dahl <ry@tinyclouds.org>
Sat, 21 May 2011 02:25:30 +0000 (19:25 -0700)
committerRyan Dahl <ry@tinyclouds.org>
Sat, 21 May 2011 02:25:30 +0000 (19:25 -0700)

Trivial merge