tree 4d08e44058834db060ed56edf9d84877269f77c7
parent 0ceb9b160335108a0235b68570b9d64df972070f
author Tim Peters <tim.peters@gmail.com> 1058797523 +0000
committer Tim Peters <tim.peters@gmail.com> 1058797523 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4033629

Merge 23c1-branch back into the head.  Barry will send email about the
New Plan (releases to be made off the head, ongoing random 2.4 stuff
to be done on a short-lived branch, provided anyone is motivated enough
to create one).