# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1166210095 28800
# Node ID 316cd5b0c9407b49f34e17539bb5bf300a64fdc9
# Parent  7034020aeaf9ffc80f2d2fb651271011d8ce9544# Parent  f47afa2401a2b92fc1a891c6d74efe8d0e95343f
Merge with main

diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py
--- a/mercurial/demandimport.py
+++ b/mercurial/demandimport.py
@@ -92,7 +92,7 @@ def _demandimport(name, globals=None, lo
                 setattr(mod, x, _demandmod(x, mod.__dict__, mod.__dict__))
         return mod
 
-ignore = []
+ignore = ['_hashlib', 'email.mime']
 
 def enable():
     "enable global demand-loading of modules"
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,8 @@ import mercurial.version
 import mercurial.demandimport
 mercurial.demandimport.enable = lambda: None
 
+extra = {}
+
 # py2exe needs to be installed to work
 try:
     import py2exe
@@ -35,6 +37,8 @@ try:
     except ImportError:
         pass
 
+    extra['console'] = ['hg']
+
 except ImportError:
     pass
 
@@ -70,4 +74,4 @@ setup(name='mercurial',
                                    license='COPYING',
                                    readme='contrib/macosx/Readme.html',
                                    welcome='contrib/macosx/Welcome.html')),
-      console=['hg'])
+      **extra)