# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1261590057 -3600
# Node ID 52c98c6d7297b68d093d77ed321f0a1fc24b8c8e
# Parent  ac212bcc852b55ae20b672ebdbfbd945059739a0# Parent  0ddbc029974250c3c94224e360bfd17215e3ddda
Merge with stable

diff -r ac212bcc852b -r 52c98c6d7297 mercurial/help/extensions.txt
--- a/mercurial/help/extensions.txt	Mon Dec 21 23:01:46 2009 +0200
+++ b/mercurial/help/extensions.txt	Wed Dec 23 18:40:57 2009 +0100
@@ -28,6 +28,6 @@
 
   [extensions]
   # disabling extension bar residing in /path/to/extension/bar.py
-  hgext.bar = !/path/to/extension/bar.py
+  bar = !/path/to/extension/bar.py
   # ditto, but no path was supplied for extension baz
-  hgext.baz = !
+  baz = !
diff -r ac212bcc852b -r 52c98c6d7297 setup.py
--- a/setup.py	Mon Dec 21 23:01:46 2009 +0200
+++ b/setup.py	Wed Dec 23 18:40:57 2009 +0100
@@ -104,9 +104,11 @@
     # If root is executing setup.py, but the repository is owned by
     # another user (as in "sudo python setup.py install") we will get
     # trust warnings since the .hg/hgrc file is untrusted. That is
-    # fine, we don't want to load it anyway.
+    # fine, we don't want to load it anyway.  Python may warn about
+    # a missing __init__.py in mercurial/locale, we also ignore that.
     err = [e for e in err.splitlines()
-           if not e.startswith('Not trusting file')]
+           if not e.startswith('Not trusting file') \
+              and not e.startswith('warning: Not importing')]
     if err:
         return ''
     return out