tree c799cb6ebcd0ec62801a275291e4f8b0ca9846d0
parent 020340f2841ec2b70b9e09921850d16019d0667e
parent 7a6b44ab6275aeeb8959437f10ae9ca17aa0b2e4
author Benjamin Peterson <benjamin@python.org> 1313693539 -0500
committer Benjamin Peterson <benjamin@python.org> 1313693539 -0500
HG:rename-source hg

merge 3.2