Merge remote-tracking branch 'upstream/v0.10' into v0.12

Conflicts:
	lib/buffer.js

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/buffer.js b/lib/buffer.js
index 9b43882e5..dd6f7a37a 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -187,7 +187,7 @@ Buffer.isEncoding = function(encoding) {
 
 Buffer.concat = function(list, length) {
   if (!util.isArray(list))
-    throw new TypeError('Usage: Buffer.concat(list[, length])');
+    throw new TypeError('list argument must be an Array of Buffers.');
 
   if (util.isUndefined(length)) {
     length = 0;