# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1186684667 25200
# Node ID 3edd6fedc33a4ef6a3c4ec011a5365330dfbd2d1
# Parent  ff461baa9c4ecea112f67d49f987339c4f4a7a64# Parent  b3cc62268a91936e577bcafbbc5d423a2892eb27
Merge with crew-stable

diff --git a/mercurial/extensions.py b/mercurial/extensions.py
--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -30,6 +30,7 @@ def load(ui, name, path):
         shortname = name
     if shortname in _extensions:
         return
+    _extensions[shortname] = None
     if path:
         # the module will be loaded in sys.modules
         # choose an unique name so that it doesn't