# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1337639728 18000
# Node ID e406b9656da31ab19bee14c0248ce00b3942cbd8
# Parent  363bde4224c8b4fb9b71dd0cbc5d74fe5cb82162# Parent  23a125545c3d6108648dc48986417261aabcfa5d
merge with stable

diff -r 363bde4224c8 -r e406b9656da3 mercurial/util.py
--- a/mercurial/util.py	Fri May 18 13:50:02 2012 -0300
+++ b/mercurial/util.py	Mon May 21 17:35:28 2012 -0500
@@ -1186,7 +1186,7 @@
     for multiplier, divisor, format in _byteunits:
         if nbytes >= divisor * multiplier:
             return format % (nbytes / float(divisor))
-    return units[-1][2] % nbytes
+    return _byteunits[-1][2] % nbytes
 
 def uirepr(s):
     # Avoid double backslash in Windows path repr()