# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1365012230 18000
# Node ID c7e8b143e086f03858dcff0dc8b8f8ba7ab49549
# Parent  835e9dfd1e492b77339aec92d1690b4462d5782d# Parent  930d54b1fd2905170ad75c2b0dbbdc04528f0f15
Merge with stable.

diff -r 835e9dfd1e49 -r c7e8b143e086 setup.py
--- a/setup.py	Tue Apr 02 14:50:50 2013 -0700
+++ b/setup.py	Wed Apr 03 13:03:50 2013 -0500
@@ -148,7 +148,7 @@
     # 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(b('Not trusting file')) \
+           if not e.startswith(b('not trusting file')) \
               and not e.startswith(b('warning: Not importing')) \
               and not e.startswith(b('obsolete feature not enabled'))]
     if err: