added import with_statement to test_Webtools_multiparthandler.py, py2.5 should now pass
fixed merge in Tests/test_Webtools_multiparthandler.py