Merge remote-tracking branch 'ry/v0.10'
authorisaacs <i@izs.me>
Wed, 13 Mar 2013 22:51:24 +0000 (15:51 -0700)
committerisaacs <i@izs.me>
Wed, 13 Mar 2013 22:51:24 +0000 (15:51 -0700)
Conflicts:
src/node_version.h


Trivial merge