merge with crew-stable stable

merge with crew-stable

--- a/mercurial/util.py	Mon Jul 23 15:55:26 2012 -0600
+++ b/mercurial/util.py	Mon Jul 23 15:40:19 2012 -0700
@@ -816,6 +816,8 @@
 
         # delegated methods
         self.write = self._fp.write
+        self.seek = self._fp.seek
+        self.tell = self._fp.tell
         self.fileno = self._fp.fileno
 
     def close(self):