py-cvs merge, python 1.5.2 compatability
1 file changed