tree 3f48a194b2f16464be2078613ca417f69d57f894
parent a977329b6fb0e4c95cabb9043794de69b27a1099
author Thomas Wouters <thomas@python.org> 1145612772 +0000
committer Thomas Wouters <thomas@python.org> 1145612772 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/p3yk%4045594

Merge trunk's 43068, deleting re.py. This leaves the branch in a broken
state (unless you happen to have a re.pyc lying around), but it'll be fixed
in the next merge.