Merge branch 'master' into v0.6-merge
authorisaacs <i@izs.me>
Tue, 15 May 2012 21:21:22 +0000 (14:21 -0700)
committerisaacs <i@izs.me>
Tue, 15 May 2012 21:21:22 +0000 (14:21 -0700)
commit643f00d3f98d9379e371fab0e26ce0a5302c1162
tree07549e110bf5474ebd6b4ef51924e0ccd7b5870e
parentfaa4d9ff5f7ff676db06240e09140f9780e2638c
parentc9676c9147e088171e60b1977ac239ded4f327df
Merge branch 'master' into v0.6-merge

Conflicts:
src/node.cc
lib/fs.js
lib/http.js
src/node.cc