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

Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/README.md
	deps/uv/build.mk
	deps/uv/src/unix/core.c
	deps/uv/src/unix/darwin-proctitle.c
	deps/uv/src/unix/darwin.c
	deps/uv/src/unix/fsevents.c
	deps/uv/src/unix/udp.c
	deps/uv/src/version.c
	deps/v8/src/platform-solaris.cc
	deps/v8/test/cctest/test-api.cc
	lib/tls.js
	src/node.h
	src/node_version.h

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index 7d80e62f0c..4974b47e6d 100755
--- a/configure
+++ b/configure
@@ -695,4 +695,4 @@ elif flavor == 'win':
 else:
   gyp_args = ['-f', 'make-' + flavor]
 
-subprocess.call([sys.executable, 'tools/gyp_node'] + gyp_args)
+subprocess.call([sys.executable, 'tools/gyp_node.py'] + gyp_args)