Merge branch 'v0.4'

Conflicts:
	src/node.js
	src/node_version.h

diff --cc doc/api/modules.markdown
Simple merge

diff --cc lib/http.js
Simple merge

diff --cc lib/module.js
Simple merge

diff --cc src/node_crypto.cc
Simple merge

diff --cc src/node_file.cc
Simple merge

diff --cc wscript
Simple merge