Merge remote-tracking branch 'origin/v0.6'

Conflicts:
	common.gypi

diff --cc common.gypi
index 68643b0,7060608..20a5d11
--- 1/common.gypi
--- 2/common.gypi
+++ b/common.gypi
@@@ -35,8 -37,13 +40,13 @@@
          },
        },
        'Release': {
 -        'defines': [ 'NDEBUG' ],
 +        # 'defines': [ 'NDEBUG' ],
          'cflags': [ '-O3', '-fomit-frame-pointer', '-fdata-sections', '-ffunction-sections' ],
+         'conditions': [
+           ['target_arch=="x64"', {
+             'msvs_configuration_platform': 'x64',
+           }],
+         ],
          'msvs_settings': {
            'VCCLCompilerTool': {
              'target_conditions': [

diff --cc deps/openssl/openssl.gyp
Simple merge

diff --cc deps/v8/SConstruct
index d4eaebe,fc67dc5..61e16ea
--- 1/deps/v8/SConstruct
--- 2/deps/v8/SConstruct
+++ b/deps/v8/SConstruct
@@@ -126,14 -125,10 +126,14 @@@ LIBRARY_FLAGS = 
        # On Solaris, to get isinf, INFINITY, fpclassify and other macros one
        # needs to define __C99FEATURES__.
        'CPPDEFINES': ['__C99FEATURES__'],
 -      'CPPPATH' : ['/usr/local/include'],
 +      'CPPPATH' : [src_dir, '/usr/local/include'],
        'LIBPATH' : ['/usr/local/lib'],
-       'CCFLAGS':      ['-ansi'],
+       'CCFLAGS':      ['-ansi', '-fno-omit-frame-pointer'],
      },
 +    'os:netbsd': {
 +      'CPPPATH' : [src_dir, '/usr/pkg/include'],
 +      'LIBPATH' : ['/usr/pkg/lib'],
 +    },
      'os:win32': {
        'CCFLAGS':      ['-DWIN32'],
        'CXXFLAGS':     ['-DWIN32'],

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

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

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

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

diff --cc lib/module.js
Simple merge

diff --cc lib/net.js
Simple merge

diff --cc node.gyp
Simple merge

diff --cc tools/gyp_node
Simple merge

diff --cc vcbuild.bat
Simple merge