tree cf06c99ed322828015db989806e7f1b4db94f868
parent 817a76cfbb3b636d6f084ea859ce61f1cdaece83
author Steven M. Gava <elguavas@python.net> 994919904 +0000
committer Steven M. Gava <elguavas@python.net> 994919904 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4021642

py-cvs merge, additions