From: Ryan Dahl <ry@tinyclouds.org>
Date: Sun, 22 May 2011 20:02:06 +0000 (-0700)
Subject: Merge branch 'v0.4'
X-Git-Tag: v0.5.0~124
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=860cb906a683bcbf297a02a1e7e821ff469fafe4;p=platform%2Fupstream%2Fnodejs.git

Merge branch 'v0.4'

Conflicts:
	src/node_version.h
---

860cb906a683bcbf297a02a1e7e821ff469fafe4