diff -r 9bbfeba33aa3 -r 7546d4a272c8 mercurial/util.py
--- a/mercurial/util.py	Wed Jul 14 22:58:29 2010 -0300
+++ b/mercurial/util.py	Wed Jul 14 22:59:43 2010 -0300
@@ -40,7 +40,9 @@
 
 def fakebuffer(sliceable, offset=0):
     return sliceable[offset:]
-if not hasattr(__builtin__, 'buffer'):
+try:
+    buffer
+except NameError:
     __builtin__.buffer = fakebuffer
 
 import subprocess