Merge branch 'v0.10'

Conflicts:
	ChangeLog
	lib/events.js
	lib/tls.js
	src/node_constants.cc
	src/node_crypto.cc
	src/node_crypto.h
	src/node_version.h

1 files changed, 3 insertions, 0 deletions

diff --git a/configure b/configure
index 6e48167403..daea8cad12 100755
--- a/configure
+++ b/configure
@@ -456,6 +456,9 @@ def configure_node(o):
   o['variables']['host_arch'] = host_arch
   o['variables']['target_arch'] = target_arch
 
+  if target_arch != host_arch and not options.without_snapshot:
+    o['variables']['want_separate_host_toolset'] = 1
+
   if target_arch == 'arm':
     configure_arm(o)