Merge remote-tracking branch 'joyent/v0.12' into v1.x

I was originally going to do this after the v0.11.15 release, but as
that release is three weeks overdue now, I decided not to wait any
longer; we don't want the delta to get too big.

Conflicts:
	lib/net.js
	test/simple/simple.status

PR-URL: https://github.com/iojs/io.js/pull/236
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Fedor Indutny <fedor@indutny.com>

diff --cc .gitignore
Simple merge

diff --cc Makefile
index b436032,e463280..25864c5
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -84,13 -78,15 +84,15 @@@ clean
  
  distclean:
        -rm -rf out
-       -rm -f config.gypi
+       -rm -f config.gypi icu_config.gypi
        -rm -f config.mk
 -      -rm -rf node node_g blog.html email.md
 +      -rm -rf $(NODE_EXE) $(NODE_G_EXE) blog.html email.md
        -rm -rf node_modules
+       -rm -rf deps/icu
+       -rm -rf deps/icu4c*.tgz deps/icu4c*.zip deps/icu-tmp
  
  test: all
 -      $(PYTHON) tools/test.py --mode=release simple message
 +      $(PYTHON) tools/test.py --mode=release message parallel sequential -J
        $(MAKE) jslint
        $(MAKE) cpplint
  

diff --cc README.md
Simple merge

diff --cc configure
Simple merge

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

diff --cc lib/_debugger.js
Simple merge

diff --cc lib/_stream_writable.js
Simple merge

diff --cc lib/net.js
index 6256b02,0ece1b0..ed80d02
--- 1/lib/net.js
--- 2/lib/net.js
+++ b/lib/net.js
@@@ -853,20 -816,14 +837,17 @@@ function connect(self, address, port, a
    if (addressType === 6 || addressType === 4) {
      var req = new TCPConnectWrap();
      req.oncomplete = afterConnect;
-     port = port | 0;
-     if (port <= 0 || port > 65535)
-       throw new RangeError('Port should be > 0 and < 65536');
- 
-     req.port = port;
 +    req.address = address;
-     if (addressType === 6) {
-       err = self._handle.connect6(req, address, port);
-     } else if (addressType === 4) {
++    req.port = port;
+ 
+     if (addressType === 4)
        err = self._handle.connect(req, address, port);
-     }
+     else
+       err = self._handle.connect6(req, address, port);
+ 
    } else {
      var req = new PipeConnectWrap();
 +    req.address = address;
      req.oncomplete = afterConnect;
      err = self._handle.connect(req, address, afterConnect);
    }

diff --cc lib/url.js
Simple merge

diff --cc node.gyp
Simple merge

diff --cc src/smalloc.cc
Simple merge

diff --cc test/parallel/test-intl.js
index 0000000,841239a..841239a
mode 000000,100644..100644
--- /dev/null
--- 2/test/simple/test-intl.js
+++ b/test/parallel/test-intl.js

diff --cc test/parallel/test-net-localerror.js
Simple merge

diff --cc test/parallel/test-process-active-wraps.js
Simple merge

diff --cc test/parallel/test-stream2-transform.js
Simple merge

diff --cc vcbuild.bat
Simple merge