merge 1.0.x changes

--HG-- branch : trunk
2009-07-01 14:39:20 +01:00
parent c8d2873fb2 1f5d156ab3
commit e0aa84d5de
5 changed files with 44 additions and 299 deletions
@@ -68,7 +68,6 @@ example/genxml.py
 example/pytest/failure_demo.py
 example/pytest/test_failures.py
 example/pytest/test_setup_flow_example.py
-ez_setup.py
 py/LICENSE
 py/_com.py
 py/bin/_findpy.py