Merge branch 'v0.4'

Conflicts:
	src/node_version.h

diff --cc cmake/configure.cmake
Simple merge

diff --cc lib/buffer.js
Simple merge

diff --cc lib/fs.js
Simple merge

diff --cc lib/http.js
Simple merge

diff --cc lib/path.js
Simple merge

diff --cc lib/tty_win32.js
Simple merge

diff --cc src/node.cc
Simple merge

diff --cc src/node.h
Simple merge

diff --cc src/node_buffer.cc
Simple merge

diff --cc src/node_file.cc
Simple merge

diff --cc src/node_version.h
Simple merge

diff --cc src/platform.h
Simple merge

diff --cc src/platform_cygwin.cc
Simple merge

diff --cc src/platform_darwin.cc
Simple merge

diff --cc src/platform_freebsd.cc
Simple merge

diff --cc src/platform_linux.cc
Simple merge

diff --cc src/platform_openbsd.cc
Simple merge

diff --cc src/platform_sunos.cc
Simple merge

diff --cc src/platform_win32.cc
Simple merge

diff --cc test/simple/test-buffer.js
Simple merge

diff --cc test/simple/test-path.js
Simple merge

diff --cc wscript
Simple merge