--- a/mercurial/util.py	Thu May 07 15:08:25 2009 +0300
+++ b/mercurial/util.py	Tue Apr 28 17:40:46 2009 +0200
@@ -14,8 +14,9 @@
 """
 
 from i18n import _
-import cStringIO, errno, re, shutil, sys, tempfile, traceback, error
-import os, stat, threading, time, calendar, glob, osutil, random
+import error, osutil
+import cStringIO, errno, re, shutil, sys, tempfile, traceback
+import os, stat, threading, time, calendar, glob, random
 import imp
 
 # Python compatibility