| commit | af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9 | [log] [tgz] |
|---|---|---|
| author | Guido van Rossum <guido@python.org> | Thu Aug 16 23:48:43 2007 +0000 |
| committer | Guido van Rossum <guido@python.org> | Thu Aug 16 23:48:43 2007 +0000 |
| tree | 7719b2787d82dd1cc7afad76ad989fc9b1f1504f | |
| parent | 10c17ba299513184e39c85fc5c3ecaf2fd13187e [diff] |
First merge from the trunk straight into the py3k branch. I'm not using the message generated by svnmerge, because it contains a lot of stuff about the Doc tree, which I'm not merging this time due to the way the Doc tree was initially added. I am however adding roman.py which was added later to Doc/tools. I'll try to diff the two Doc trees separately to see if there's stuff I missed.