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

Conflicts:
	ChangeLog
	src/node_version.h
	test/message/stdin_messages.out
	tools/install.py

diff --cc AUTHORS
Simple merge

diff --cc ChangeLog
index d7d86eb,08fd494..d2ea9ef
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,27 -1,50 +1,73 @@@
- 2012.08.02, Version 0.8.5 (Stable)
 +2012.07.20, Version 0.9.0 (Unstable)
 +
 +* punycode: update to v1.1.1 (Mathias Bynens)
 +
 +* c-ares: upgrade to 1.9.0 (Saúl Ibarra Corretgé)
 +
 +* dns: ignore rogue DNS servers reported by windows (Saúl Ibarra Corretgé)
 +
 +* unix: speed up uv_async_send() (Ben Noordhuis)
 +
 +* darwin: get cpu model correctly on mac (Xidorn Quan)
 +
 +* nextTick: Handle tick callbacks before any other I/O (isaacs)
 +
 +* Enable color customization of `util.inspect` (Pavel Lang)
 +
 +* tls: Speed and memory improvements (Fedor Indutny)
 +
 +* readline: Use one history item for reentered line (Vladimir Beloborodov)
 +
 +* Fix #3521 Make process.env more like a regular Object (isaacs)
 +
 +
+ 2012.08.15, Version 0.8.7 (Stable)
+ 
+ * npm: Upgrade to 1.1.49
+ 
+ * website: download page (Golo Roden)
+ 
+ * crypto: fix uninitialized memory access in openssl (Ben Noordhuis)
+ 
+ * buffer, crypto: fix buffer decoding (Ben Noordhuis)
+ 
+ * build: compile with -fno-tree-vrp when gcc >= 4.0 (Ben Noordhuis)
+ 
+ * tls: handle multiple CN fields when verifying cert (Ben Noordhuis)
+ 
+ * doc: remove unused util from child_process (Kyle Robinson Young)
+ 
+ * build: rework -fvisibility=hidden detection (Ben Noordhuis)
+ 
+ * windows: don't duplicate invalid stdio handles (Bert Belder)
+ 
+ * windows: fix typos in process-stdio.c (Bert Belder)
+ 
+ 
+ 2012.08.07, Version 0.8.6 (Stable), 0544a586ca6b6b900a42e164033dbf350765700a
+ 
+ * npm: Upgrade to v1.1.48
+ 
+ * Add 'make binary' to build binary tarballs for all Unixes (Nathan Rajlich)
+ 
+ * zlib: Emit 'close' on destroy(). (Dominic Tarr)
+ 
+ * child_process: Fix stdout=null when stdio=['pipe'] (Tyler Neylon)
+ 
+ * installer: prevent ETXTBSY errors (Ben Noordhuis)
+ 
+ * installer: honor --without-npm, default install path (Ben Noordhuis)
+ 
+ * net: make pause work with connecting sockets (Bert Belder)
+ 
+ * installer: fix cross-compile installs (Ben Noordhuis)
+ 
+ * net: fix .listen({fd:0}) (Ben Noordhuis)
+ 
+ * windows: map WSANO_DATA to UV_ENOENT (Bert Belder)
+ 
+ 
+ 2012.08.02, Version 0.8.5 (Stable), 9b86a4453f0c76f2707a75c0b2343aba33ec63bc
  
  * node: tag Encode and friends NODE_EXTERN (Ben Noordhuis)
  

diff --cc Makefile
Simple merge

diff --cc configure
Simple merge

diff --cc lib/child_process.js
Simple merge

diff --cc lib/fs.js
Simple merge

diff --cc lib/net.js
Simple merge

diff --cc lib/tls.js
Simple merge

diff --cc src/node.cc
Simple merge

diff --cc tools/install.py
index 7f48232,028e5ca..ca72a55
--- 1/tools/install.py
--- 2/tools/install.py
+++ b/tools/install.py
@@@ -73,8 -74,62 +74,8 @@@ def try_remove(path, dst)
  def install(paths, dst): map(lambda path: try_copy(path, dst), paths)
  def uninstall(paths, dst): map(lambda path: try_remove(path, dst), paths)
  
 -def waf_files(action):
 -  action(['tools/node-waf'], 'bin/node-waf')
 -  action(['tools/wafadmin/ansiterm.py',
 -          'tools/wafadmin/Build.py',
 -          'tools/wafadmin/Configure.py',
 -          'tools/wafadmin/Constants.py',
 -          'tools/wafadmin/Environment.py',
 -          'tools/wafadmin/__init__.py',
 -          'tools/wafadmin/Logs.py',
 -          'tools/wafadmin/Node.py',
 -          'tools/wafadmin/Options.py',
 -          'tools/wafadmin/pproc.py',
 -          'tools/wafadmin/py3kfixes.py',
 -          'tools/wafadmin/Runner.py',
 -          'tools/wafadmin/Scripting.py',
 -          'tools/wafadmin/TaskGen.py',
 -          'tools/wafadmin/Task.py',
 -          'tools/wafadmin/Utils.py'],
 -          'lib/node/wafadmin/')
 -  action(['tools/wafadmin/Tools/ar.py',
 -          'tools/wafadmin/Tools/cc.py',
 -          'tools/wafadmin/Tools/ccroot.py',
 -          'tools/wafadmin/Tools/compiler_cc.py',
 -          'tools/wafadmin/Tools/compiler_cxx.py',
 -          'tools/wafadmin/Tools/compiler_d.py',
 -          'tools/wafadmin/Tools/config_c.py',
 -          'tools/wafadmin/Tools/cxx.py',
 -          'tools/wafadmin/Tools/dmd.py',
 -          'tools/wafadmin/Tools/d.py',
 -          'tools/wafadmin/Tools/gas.py',
 -          'tools/wafadmin/Tools/gcc.py',
 -          'tools/wafadmin/Tools/gdc.py',
 -          'tools/wafadmin/Tools/gnu_dirs.py',
 -          'tools/wafadmin/Tools/gob2.py',
 -          'tools/wafadmin/Tools/gxx.py',
 -          'tools/wafadmin/Tools/icc.py',
 -          'tools/wafadmin/Tools/icpc.py',
 -          'tools/wafadmin/Tools/__init__.py',
 -          'tools/wafadmin/Tools/intltool.py',
 -          'tools/wafadmin/Tools/libtool.py',
 -          'tools/wafadmin/Tools/misc.py',
 -          'tools/wafadmin/Tools/nasm.py',
 -          'tools/wafadmin/Tools/node_addon.py',
 -          'tools/wafadmin/Tools/osx.py',
 -          'tools/wafadmin/Tools/preproc.py',
 -          'tools/wafadmin/Tools/python.py',
 -          'tools/wafadmin/Tools/suncc.py',
 -          'tools/wafadmin/Tools/suncxx.py',
 -          'tools/wafadmin/Tools/unittestw.py',
 -          'tools/wafadmin/Tools/winres.py',
 -          'tools/wafadmin/Tools/xlc.py',
 -          'tools/wafadmin/Tools/xlcxx.py'],
 -          'lib/node/wafadmin/Tools/')
 -
  def update_shebang(path, shebang):
-   print 'updating shebang of %s' % path
+   print 'updating shebang of %s to %s' % (path, shebang)
    s = open(path, 'r').read()
    s = re.sub(r'#!.*\n', '#!' + shebang + '\n', s)
    open(path, 'w').write(s)