Merge remote-tracking branch 'ry/v0.10' into master

Conflicts:
	src/node.cc
	src/node_version.h

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/fs.js b/lib/fs.js
index e637e03f6..b6cc49036 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -950,7 +950,7 @@ fs.writeFileSync = function(path, data, options) {
   assertEncoding(options.encoding);
 
   var flag = options.flag || 'w';
-  var fd = fs.openSync(path, flag);
+  var fd = fs.openSync(path, flag, options.mode);
   if (!Buffer.isBuffer(data)) {
     data = new Buffer('' + data, options.encoding || 'utf8');
   }