tree 083bbdb61c46f1270a59e53084fdc1b81abc5bf5
parent 16bd0ff16a324648faa0b9e38e233c18bf59633a
author Guido van Rossum <guido@python.org> 868992468 +0000
committer Guido van Rossum <guido@python.org> 868992468 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%408273

Merged Jeffrey's changes in.