tree a8d279a739aa00c92702e31cc2ad9b1f79521e0f
parent 12fe95351b6f704fd13a22605066a3335e2e4cc9
parent fc9bbd16927d8384733e0444d7c4daed7d1b6fd4
author Benjamin Peterson <benjamin@python.org> 1312474197 -0500
committer Benjamin Peterson <benjamin@python.org> 1312474197 -0500
HG:rename-source hg

merge 3.2