--- a/mercurial/lock.py	Thu May 07 15:08:25 2009 +0300
+++ b/mercurial/lock.py	Tue Apr 28 17:40:46 2009 +0200
@@ -5,7 +5,8 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
-import errno, os, socket, time, util, error
+import util, error
+import errno, os, socket, time
 import warnings
 
 class lock(object):