Merge branch 'v0.4'

author Ryan Dahl <ry@tinyclouds.org>

Sun, 22 May 2011 20:02:06 +0000 (13:02 -0700)

committer Ryan Dahl <ry@tinyclouds.org>

Sun, 22 May 2011 20:02:06 +0000 (13:02 -0700)
author Ryan Dahl <ry@tinyclouds.org>
Sun, 22 May 2011 20:02:06 +0000 (13:02 -0700)
committer Ryan Dahl <ry@tinyclouds.org>
Sun, 22 May 2011 20:02:06 +0000 (13:02 -0700)
diff --cc doc/api/net.markdown
Simple merge
diff --cc lib/http.js
Simple merge
diff --cc wscript
Simple merge
author	Ryan Dahl <ry@tinyclouds.org>
	Sun, 22 May 2011 20:02:06 +0000 (13:02 -0700)
committer	Ryan Dahl <ry@tinyclouds.org>
	Sun, 22 May 2011 20:02:06 +0000 (13:02 -0700)
		1	2
doc/api/net.markdown	patch \|	diff1 \|	diff2 \|	blob \| history
lib/http.js	patch \|	diff1 \|	diff2 \|	blob \| history
wscript	patch \|	diff1 \|	diff2 \|	blob \| history