# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1343083219 25200
# Node ID 57a47190e96cf4e0959e9d43a74f858ca79b9da1
# Parent  9fb8312dbdbd2f37a9d9752a1ee310eb974520ab# Parent  e731285351053177f93d5c76e2c70f99cf397b4f
merge with crew-stable

diff -r 9fb8312dbdbd -r 57a47190e96c mercurial/util.py
--- 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):