merge.
--- a/tests/run-tests.py Tue Jul 25 13:50:32 2006 -0700
+++ b/tests/run-tests.py Tue Jul 25 13:50:52 2006 -0700
@@ -25,7 +25,7 @@
parser.add_option("-v", "--verbose", action="store_true",
help="output verbose messages")
parser.add_option("-t", "--timeout", type="int",
- help="output verbose messages")
+ help="kill errant tests after TIMEOUT seconds")
parser.add_option("-c", "--cover", action="store_true",
help="print a test coverage report")
parser.add_option("-s", "--cover_stdlib", action="store_true",