Merge "Fixed runtest to work with python != 2.4"