# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1259207059 21600
# Node ID 5c990169c02d09a4e1e39ee8989bc5e98ec50c81
# Parent  3aa420c56ac4297ea953448b98aa2d839e693b32# Parent  a0680daed7b243838a1afec3318baa2594996e37
Merge with stable

diff -r 3aa420c56ac4 -r 5c990169c02d tests/run-tests.py
--- a/tests/run-tests.py	Mon Jun 01 20:32:53 2009 +0200
+++ b/tests/run-tests.py	Wed Nov 25 21:44:19 2009 -0600
@@ -789,7 +789,7 @@
 
     # Reset some environment variables to well-known values so that
     # the tests produce repeatable output.
-    os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
+    os.environ['LANG'] = os.environ['LC_ALL'] = os.environ['LANGUAGE'] = 'C'
     os.environ['TZ'] = 'GMT'
     os.environ["EMAIL"] = "Foo Bar <foo.bar@example.com>"
     os.environ['CDPATH'] = ''