diff mercurial/util.py @ 5921:549a7ebe1607

merge with crew-stable

--- a/mercurial/util.py	Sun Jan 20 14:39:25 2008 +0100
+++ b/mercurial/util.py	Tue Jan 22 00:55:01 2008 +0100
@@ -15,7 +15,7 @@
 from i18n import _
 import cStringIO, errno, getpass, popen2, re, shutil, sys, tempfile, strutil
 import os, stat, threading, time, calendar, ConfigParser, locale, glob, osutil
-import re, urlparse
+import urlparse
 
 try:
     set = set