Merge branch 'v0.10' into merge-review2merge-review2

Reverted caeb6773 for being unable to port the change to deps/v8. The
change will be ported directly in a later commit.

Conflicts:
	ChangeLog
	configure
	doc/api/child_process.markdown
	doc/api/tls.markdown
	doc/api/url.markdown
	lib/assert.js
	lib/child_process.js
	lib/crypto.js
	lib/dgram.js
	lib/http.js
	lib/net.js
	lib/timers.js
	lib/tls.js
	src/node.cc
	src/node.h
	src/node.js
	src/node_crypto.cc
	src/node_version.h
	test/common.js
	test/simple/test-child-process-spawn-typeerror.js
	tools/certdata.txt

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/fs.js b/lib/fs.js
index a97ba3aa6..7731f244b 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -31,6 +31,7 @@ var pathModule = require('path');
 var binding = process.binding('fs');
 var constants = process.binding('constants');
 var fs = exports;
+var Buffer = require('buffer').Buffer;
 var Stream = require('stream').Stream;
 var EventEmitter = require('events').EventEmitter;
 var FSReqWrap = binding.FSReqWrap;