tree c37ac712055910a6ddf9b4eef66c352a11df0a9c
parent fa1eddfb21ea0ec8b35d3b389c31a94d2baae9b8
author Guido van Rossum <guido@python.org> 1051316491 +0000
committer Guido van Rossum <guido@python.org> 1051316491 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4032490

Merge back from r23b1-branch