# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1193263753 -7200
# Node ID f00ed7c5877bca51e045c0e56ac7ce5dc8630771
# Parent  3aa5c45874c60560d75df74adbc964e107c8538a# Parent  b3afa6725082d8e1195f4ef032f143db9866acb5
Merge with crew-stable

diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py
--- a/mercurial/httprepo.py
+++ b/mercurial/httprepo.py
@@ -230,6 +230,9 @@ class httprepository(remoterepository):
             # "http_proxy.always" config is for running tests on localhost
             if (not ui.configbool("http_proxy", "always") and
                 host.lower() in no_list):
+                # avoid auto-detection of proxy settings by appending
+                # a ProxyHandler with no proxies defined.
+                handlers.append(urllib2.ProxyHandler({}))
                 ui.debug(_('disabling proxy for %s\n') % host)
             else:
                 proxyurl = urlparse.urlunsplit((