tree 9568c8e25ca08d3407ee7bb1ad584337334b43a0
parent c9baac88abf24bdd6a70525567425334c7dc1939
author Thomas Heller <theller@ctypes.org> 1240603824 +0000
committer Thomas Heller <theller@ctypes.org> 1240603824 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4071850

Fix merge accident.