tree 70fc80b489442b5552d2452f4cc6bbdea9eeb3d7
parent 9b727eca26ac97e2029dff669cf031d3ae5150c2
parent b4b0b354dd39ad5a9e4a90625b0528c0f4e4e349
author Benjamin Peterson <benjamin@python.org> 1327527116 -0500
committer Benjamin Peterson <benjamin@python.org> 1327527116 -0500
HG:rename-source hg

merge 3.2