Merge remote-tracking branch 'upstream/v0.10'

Reverted 9520adeb37f5ebe02a68669ec97770f4869705bb

Conflicts:
	deps/cares/src/ares_parse_txt_reply.c
	deps/uv/.mailmap
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/include/uv.h
	deps/uv/src/unix/error.c
	deps/uv/src/unix/process.c
	deps/uv/src/version.c
	deps/uv/src/win/pipe.c
	deps/uv/src/win/signal.c
	deps/uv/src/win/util.c
	deps/uv/test/test-spawn.c
	deps/uv/vcbuild.bat
	deps/v8/src/platform-posix.cc
	deps/v8/tools/gyp/v8.gyp
	lib/util.js
	src/node.cc
	test/simple/test-util-format.js
	test/simple/test-util.js

diff --cc Makefile
Simple merge

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

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

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

diff --cc lib/child_process.js
Simple merge

diff --cc src/node.cc
index 51fd6a8,8257604..be04da0
--- 1/src/node.cc
--- 2/src/node.cc
+++ b/src/node.cc
@@@ -1924,13 -1709,15 +1924,15 @@@ void Exit(const FunctionCallbackInfo<Va
  }
  
  
 -static Handle<Value> Uptime(const Arguments& args) {
 -  HandleScope scope;
 +static void Uptime(const FunctionCallbackInfo<Value>& args) {
 +  Environment* env = Environment::GetCurrent(args.GetIsolate());
 +  HandleScope scope(env->isolate());
    double uptime;
-   if (uv_uptime(&uptime))
-     return;
-   args.GetReturnValue().Set(uptime - prog_start_time);
+ 
+   uv_update_time(uv_default_loop());
+   uptime = uv_now(uv_default_loop()) - prog_start_time;
+ 
 -  return scope.Close(Integer::New(uptime / 1000));
++  args.GetReturnValue().Set(Number::New(env->isolate(), uptime / 1000));
  }
  
  
@@@ -3342,12 -2886,11 +3344,12 @@@ static void DebugEnd(const FunctionCall
  }
  
  
 -char** Init(int argc, char *argv[]) {
 +void Init(int* argc,
 +          const char** argv,
 +          int* exec_argc,
 +          const char*** exec_argv) {
    // Initialize prog_start_time to get relative uptime.
-   uv_uptime(&prog_start_time);
+   prog_start_time = uv_now(uv_default_loop());
  
    // Make inherited handles noninheritable.
    uv_disable_stdio_inheritance();