# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1263380406 -3600
# Node ID c4c0502be198fb294413853e896f2825b0435bad
# Parent  4b2a086bee31a3021aefb8db0a055d234840e3db# Parent  cd3e5c47d6631dc5eccaa5ee043ef1905ded8c8b
merge with stable

diff -r 4b2a086bee31 -r c4c0502be198 mercurial/demandimport.py
--- a/mercurial/demandimport.py	Tue Jan 12 22:20:21 2010 +0100
+++ b/mercurial/demandimport.py	Wed Jan 13 12:00:06 2010 +0100
@@ -120,6 +120,7 @@
     '_xmlplus',
     'fcntl',
     'win32com.gen_py',
+    '_winreg', # 2.7 mimetypes needs immediate ImportError
     'pythoncom',
     # imported by tarfile, not available under Windows
     'pwd',
diff -r 4b2a086bee31 -r c4c0502be198 mercurial/ui.py
--- a/mercurial/ui.py	Tue Jan 12 22:20:21 2010 +0100
+++ b/mercurial/ui.py	Wed Jan 13 12:00:06 2010 +0100
@@ -134,6 +134,8 @@
         v = self.config(section, name, None, untrusted)
         if v is None:
             return default
+        if isinstance(v, bool):
+            return v
         if v.lower() not in _booleans:
             raise error.ConfigError(_("%s.%s not a boolean ('%s')")
                                     % (section, name, v))