Merge with -stable

mercurial/util_win32.py

@@ -317,10 +317,8 b' class posixfile_nt(object):'
             self.closed = True
 
     def flush(self):
-        try:
-            win32file.FlushFileBuffers(self.handle)
-        except pywintypes.error, err:
-            raise WinIOError(err)
+        # we have no application-level buffering
+        pass
 
     def truncate(self, pos=0):
         try: