tree 0e45174da07b52f10ff3d1a31ed99ed02e56cced
parent 3fc2ca3884bec42d9b68336183bb07a83311ea56
author Thomas Wouters <thomas@python.org> 1145619052 +0000
committer Thomas Wouters <thomas@python.org> 1145619052 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/p3yk%4045600

Fix merge glitch.