Merge branch 'master' into net2

diff --cc src/node.cc
index e2e0b81,77b9700..a4fd638
--- 1/src/node.cc
--- 2/src/node.cc
+++ b/src/node.cc
@@@ -9,10 -9,9 +9,12 @@@
  #include <unistd.h>
  #include <errno.h>
  #include <dlfcn.h> /* dlopen(), dlsym() */
+ #include <sys/types.h>
+ #include <unistd.h> /* setuid, getuid */
  
 +#include <node_buffer.h>
 +#include <node_io_watcher.h>
 +#include <node_net2.h>
  #include <node_events.h>
  #include <node_dns.h>
  #include <node_net.h>

diff --cc src/node_file.cc
Simple merge

diff --cc wscript
Simple merge