Merge branch 'v0.4'

diff --cc doc/api/crypto.markdown
Simple merge

diff --cc doc/api/fs.markdown
Simple merge

diff --cc src/node_crypto.cc
Simple merge

diff --cc wscript
Simple merge