# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1299504867 -3600
# Node ID 460ab7a133ac030aa9dc4c59ec6317b538f9b967
# Parent  cd432ceb6544d0abbc462e90d7026b2deabc0538# Parent  c3681742c0c7beadc9d9f81bada6026d8bef4fc5
Merge with stable

diff -r cd432ceb6544 -r 460ab7a133ac tests/run-tests.py
--- a/tests/run-tests.py	Tue Feb 15 10:40:29 2011 +0100
+++ b/tests/run-tests.py	Mon Mar 07 14:34:27 2011 +0100
@@ -227,8 +227,8 @@
                 continue
 
             for line in f.readlines():
-                line = line.strip()
-                if line and not line.startswith('#'):
+                line = line.split('#', 1)[0].strip()
+                if line:
                     blacklist[line] = filename
 
             f.close()