Added by Ryan Dahl about 13 years ago
Merge branch 'v0.4'
Conflicts: doc/api/modules.markdown test/simple/test-crypto.js