# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1346194748 18000
# Node ID fc14953e8e34667181cd0d492825342b5e1e880b
# Parent  81b115385bc778b2474da2ed5498ce06a236e0c0# Parent  b0aad9fb87f947e821f0381d461f1794e73833a7
merge with stable

diff -r 81b115385bc7 -r fc14953e8e34 mercurial/obsolete.py
--- a/mercurial/obsolete.py	Tue Aug 28 20:57:11 2012 +0200
+++ b/mercurial/obsolete.py	Tue Aug 28 17:59:08 2012 -0500
@@ -52,7 +52,7 @@
   cannot contain '\0'.
 """
 import struct
-from mercurial import util, base85
+import util, base85
 from i18n import _
 
 # the obsolete feature is not mature enought to be enabled by default.