# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1153860652 25200
# Node ID 7a6708e73e2187361bc5f7b936f7e4f7c897065a
# Parent  109a22f5434a09b43447f39200bdfa89503040e4# Parent  118b198c942324ae919d53db0586c24f9559b0e8
merge.

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -25,7 +25,7 @@ parser = optparse.OptionParser("%prog [o
 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",