Merge branch 'v0.4'

Conflicts:
	src/node_version.h

diff --cc lib/net.js
Simple merge

diff --cc lib/tls.js
index d4599ab,b34ed95..a8f1898
--- 1/lib/tls.js
--- 2/lib/tls.js
+++ b/lib/tls.js
@@@ -723,12 -735,10 +735,12 @@@ function Server(/* [options], listener 
        key: self.key,
        cert: self.cert,
        ca: self.ca,
 +      ciphers: self.ciphers,
        secureProtocol: self.secureProtocol,
 +      secureOptions: self.secureOptions,
        crl: self.crl
      });
-     //creds.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA');
+     creds.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA');
  
      var pair = new SecurePair(creds,
                                true,

diff --cc wscript
Simple merge