# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1359497950 0
# Node ID 49ca5f6f1a9553503d0dece72edfac4f8b5a21be
# Parent  c762ba67e444a342ebc732f4f7ce0635ff22f40c# Parent  9bd54c35af97dddb1237d1886fb848e7943fc73c
Merge with stable

diff -r c762ba67e444 -r 49ca5f6f1a95 tests/run-tests.py
--- a/tests/run-tests.py	Wed Jan 23 22:30:58 2013 +0000
+++ b/tests/run-tests.py	Tue Jan 29 22:19:10 2013 +0000
@@ -1252,7 +1252,7 @@
     os.environ['no_proxy'] = ''
     os.environ['NO_PROXY'] = ''
     os.environ['TERM'] = 'xterm'
-    os.environ['PYTHONHASHSEED'] = 'random'
+    os.environ['PYTHONHASHSEED'] = os.environ.get('PYTHONHASHSEED', 'random')
 
     # unset env related to hooks
     for k in os.environ.keys():