Merge remote-tracking branch 'origin/v0.10' into master

Conflicts:
	doc/api/buffer.markdown
	lib/_stream_readable.js
	lib/assert.js
	lib/buffer.js
	lib/child_process.js
	lib/http.js
	lib/string_decoder.js
	lib/zlib.js
	node.gyp
	test/simple/test-buffer.js
	test/simple/test-https-foafssl.js
	test/simple/test-stream2-compatibility.js
	test/simple/test-tls-server-verify.js

1 files changed, 2 insertions, 0 deletions

diff --git a/configure b/configure
index 772e4e14b3..f7f6cc3d72 100755
--- a/configure
+++ b/configure
@@ -473,6 +473,8 @@ def configure_node(o):
 
   if target_arch != host_arch and not options.without_snapshot:
     o['variables']['want_separate_host_toolset'] = 1
+  else:
+    o['variables']['want_separate_host_toolset'] = 0
 
   if target_arch == 'arm':
     configure_arm(o)