commit | cf0d8ab818852503057b8ade6cccc403fbb5d2be | [log] [tgz] |
---|---|---|
author | Barry Warsaw <barry@python.org> | Mon May 23 15:22:56 2011 -0400 |
committer | Barry Warsaw <barry@python.org> | Mon May 23 15:22:56 2011 -0400 |
tree | 8fcd89ece63691dade1d0c0f5c78f5b70eb84880 | |
parent | e26bc109ffe4ca1c0cb73270d6f8662e6191cb40 [diff] |
Replay changeset 70238:03e488b5c009 from fubar branch. Original commit message: Reconcile with the 2.6svn branch. The 2.6.7 release will be made from Subversion, but there were differences, so this brings them in sync. These changes should *not* propagate to any newer versions.