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

diff --cc doc/index.html
index b5b12fe,8f58f6f..932ba8f
--- 1/doc/index.html
--- 2/doc/index.html
+++ b/doc/index.html
@@@ -31,9 -31,9 +31,9 @@@
  
          <a href="#download" class="button" id="downloadbutton">Download</a>
          <a href="api/" class="button" id="docsbutton">Docs</a>
-         <p class="version">__VERSION__</p> 
+         <p class="version">__VERSION__</p>
  
 -        <a href="http://github.com/joyent/node"><img class="forkme" src="https://a248.e.akamai.net/camo.github.com/abad93f42020b733148435e2cd92ce15c542d320/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" alt="Fork me on GitHub"></a>
 +        <a href="http://github.com/joyent/node"><img class="forkme" src="images/forkme.png" alt="Fork me on GitHub"></a>
      </div>
      <div id="quotes" class="clearfix">
          <h2>Node.js in the Industry</h2>