Merge branch 'v0.4'
authorRyan Dahl <ry@tinyclouds.org>
Sun, 20 Feb 2011 03:26:56 +0000 (19:26 -0800)
committerRyan Dahl <ry@tinyclouds.org>
Sun, 20 Feb 2011 03:26:56 +0000 (19:26 -0800)
Conflicts:
src/node_version.h


Trivial merge