Added by Fedor Indutny over 12 years ago
Merge branch 'v0.6'
Conflicts: src/handle_wrap.cc src/node_zlib.cc src/process_wrap.cc