tree 5e1063a5006387eac1205772e7aa31a2f7b5ab52
parent e7a15bb808f2118920fed0b5949f821940cf7416
author Georg Brandl <georg@python.org> 1201217674 +0000
committer Georg Brandl <georg@python.org> 1201217674 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4060267

Fix merge glitch.