Merge branch 'v0.6'

Conflicts:
	Makefile
	src/node_version.h
	test/simple/test-http-response-no-headers.js

diff --cc deps/uv/include/uv.h
Simple merge

diff --cc deps/uv/src/unix/internal.h
index 4784bcf,80df6a8..6380615
--- 1/deps/uv/src/unix/internal.h
--- 2/deps/uv/src/unix/internal.h
+++ b/deps/uv/src/unix/internal.h
@@@ -27,7 -27,13 +27,11 @@@
  
  #include <stddef.h> /* offsetof */
  
+ #if __STRICT_ANSI__
+ # define inline __inline
+ #endif
+ 
  #undef HAVE_FUTIMES
 -#undef HAVE_PIPE2
 -#undef HAVE_ACCEPT4
  #undef HAVE_KQUEUE
  #undef HAVE_PORTS_FS
  

diff --cc src/node_version.h
index 06f8663,ad56ec4..963e47d
--- 1/src/node_version.h
--- 2/src/node_version.h
+++ b/src/node_version.h
@@@ -27,9 -27,9 +27,10 @@@
  #define NODE_VERSION_H
  
  #define NODE_MAJOR_VERSION 0
 -#define NODE_MINOR_VERSION 6
 -#define NODE_PATCH_VERSION 3
 +#define NODE_MINOR_VERSION 7
 +#define NODE_PATCH_VERSION 0
 +#define NODE_VERSION_IS_RELEASE 0
+ #define NODE_VERSION_IS_RELEASE 1
  
  #ifndef NODE_STRINGIFY
  #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)