tree cb597e3c84bf6d845c849e5d715a011922337704
parent 33f4d6d1db5dd915cce811bd6f7a963d4dbe8db2
author Guido van Rossum <guido@python.org> 1001622607 +0000
committer Guido van Rossum <guido@python.org> 1001622607 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4023401

Merge branch changes (coercion, rich comparisons) into trunk.