Merge remote-tracking branch 'ry/v0.8' into v0.8-merge

Conflicts:
	AUTHORS
	ChangeLog
	deps/openssl/openssl.gyp
	deps/uv/src/unix/linux/linux-core.c
	deps/uv/src/unix/process.c
	deps/uv/src/unix/stream.c
	deps/v8/src/arm/builtins-arm.cc
	deps/v8/src/arm/code-stubs-arm.cc
	deps/v8/src/arm/full-codegen-arm.cc
	lib/tls.js
	src/node_version.h
	test/simple/test-http-client-timeout-agent.js

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/fs.js b/lib/fs.js
index 3ed99c77f..e8a9aa4f7 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -956,7 +956,10 @@ function StatWatcher() {
   var oldStatus = -1;
 
   this._handle.onchange = function(current, previous, newStatus) {
-    if (oldStatus == -1 && newStatus == -1) return;
+    if (oldStatus === -1 &&
+        newStatus === -1 &&
+        current.nlink === previous.nlink) return;
+
     oldStatus = newStatus;
     self.emit('change', current, previous);
   };