Merge with stable.
--- 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: