# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2010-05-01 14:15:27
# Node ID 355a7535bcac78bcd7a9778b01c98f4ffeb1e87e
# Parent  bf7e63fedca12ab725af8a5cb0d0eced403bc7ec
# Parent  59d0d715fbfa7028e50bac9a90561e6c311d6122

Merge with stable

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -105,8 +105,8 @@ def _runcatch(ui, args):
     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():