# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1272723327 -7200
# Node ID 355a7535bcac78bcd7a9778b01c98f4ffeb1e87e
# Parent  bf7e63fedca12ab725af8a5cb0d0eced403bc7ec# Parent  59d0d715fbfa7028e50bac9a90561e6c311d6122
Merge with stable

diff -r bf7e63fedca1 -r 355a7535bcac hgext/relink.py
diff -r bf7e63fedca1 -r 355a7535bcac mercurial/dispatch.py
--- a/mercurial/dispatch.py	Thu Apr 29 22:14:14 2010 -0500
+++ b/mercurial/dispatch.py	Sat May 01 16:15:27 2010 +0200
@@ -105,8 +105,8 @@
     except util.Abort, inst:
         ui.warn(_("abort: %s\n") % inst)
     except ImportError, inst:
+        ui.warn(_("abort: %s!\n") % inst)
         m = str(inst).split()[-1]
-        ui.warn(_("abort: could not import module %s!\n") % m)
         if m in "mpatch bdiff".split():
             ui.warn(_("(did you forget to compile extensions?)\n"))
         elif m in "zlib".split():