Merge branch 'v0.7.11-release'

4 files changed, 42 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 32707fcae..1af23f994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,41 @@
-2012.06.11, Version 0.7.10 (unstable)
+2012.06.15, Version 0.7.11 (unstable)
+
+* V8: Upgrade to v3.11.10
+
+* npm: Upgrade to 1.1.26
+
+* doc: Improve cross-linking in API docs markdown (Ben Kelly)
+
+* Fix #3425: removeAllListeners should delete array (Reid Burke)
+
+* cluster: don't silently drop messages when the write queue gets big (Bert Belder)
+
+* Add Buffer.concat method (isaacs)
+
+* windows: make symlinks tolerant to forward slashes (Bert Belder)
+
+* build: Add node.d and node.1 to installer (isaacs)
+
+* cluster: rename worker.unqiueID to worker.id (Andreas Madsen)
+
+* Windows: Enable ETW events on Windows for existing DTrace probes. (Igor Zinkovsky)
+
+* test: bundle node-weak in test/gc so that it doesn't need to be downloaded (Nathan Rajlich)
+
+* Make many tests pass on Windows (Bert Belder)
+
+* Fix #3388 Support listening on file descriptors (isaacs)
+
+* Fix #3407 Add os.tmpDir() (isaacs)
+
+* Unbreak the snapshotted build on Windows (Bert Belder)
+
+* Clean up child_process.kill throws (Bert Belder)
+
+* crypto: make cipher/decipher accept buffer args (Ben Noordhuis)
+
+
+2012.06.11, Version 0.7.10 (unstable), 12a32a48a30182621b3f8e9b9695d1946b53c131
 
 * Roll V8 back to 3.9.24.31
 
diff --git a/doc/index.html b/doc/index.html
index 9f61fd1ff..4f5456287 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -80,7 +80,7 @@
         <a href="#" id="download-close">X</a>
         <img id="download-logo" src="http://nodejs.org/images/download-logo.png" alt="node.js">
         <ul id="installers" class="clearfix">
-            <li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.msi">Windows Installer</a><br>node-__VERSION__.msi</li>
+            <li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__-x86.msi">Windows Installer</a><br>node-__VERSION__-x86.msi</li>
             <li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.pkg">Macintosh Installer</a><br>node-__VERSION__.pkg</li>
             <li id="source"><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.tar.gz">Source Code</a><br>node-__VERSION__.tar.gz</li>
         </ul>
@@ -88,6 +88,7 @@
             <li><a href="https://raw.github.com/joyent/node/__VERSION__/ChangeLog">Change Log</a></li>
             <li><a href="http://nodejs.org/docs/__VERSION__/api/">Documentation</a></li>
             <li><a href="http://nodejs.org/dist/__VERSION__">Other release files</a></li>
+            <li><a href="http://nodejs.org/dist/__VERSION__/x64/node-__VERSION__-x64.msi">Windows x64 Installer</a></li>
             <li><a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">License</a></li>
             <li><a href="https://github.com/joyent/node">Git Repository</a></li>
             <li><a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">Installing
diff --git a/lib/child_process.js b/lib/child_process.js
index 6e0912ee2..fa6c1c703 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -637,7 +637,7 @@ function maybeClose(subprocess) {
 
 function ChildProcess() {
   EventEmitter.call(this);
-  
+
   var self = this;
 
   this._closesNeeded = 1;
diff --git a/src/node_version.h b/src/node_version.h
index 227cba492..b607263e1 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -29,7 +29,7 @@
 #define NODE_MAJOR_VERSION 0
 #define NODE_MINOR_VERSION 7
 #define NODE_PATCH_VERSION 11
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)