Merge remote-tracking branch 'ry/v0.6' into v0.6-merge
authorisaacs <i@izs.me>
Wed, 9 May 2012 22:12:13 +0000 (15:12 -0700)
committerisaacs <i@izs.me>
Wed, 9 May 2012 22:12:13 +0000 (15:12 -0700)
commit07be9fc3a674d8a2e148041f3674c1abaee0907f
treeb4075cce21b1a5697420a45388bb884bc71418d9
parent5979f096d1b702ca2ba95664a0bbc8210109775b
parentbf9d8e9214e2098bacf18416564dc3a91bcdf5d6
Merge remote-tracking branch 'ry/v0.6' into v0.6-merge

Conflicts:
Makefile
lib/zlib.js
src/node.cc
src/node.js
lib/http.js
lib/module.js
src/node.cc
src/node.js
test/message/throw_custom_error.out
test/message/throw_non_error.out
test/message/undefined_reference_in_new_context.out