tree 3df601415b424075aaed765402cc28c7879e1740
parent 8c6f88efa2371addacc2acf5cc4634974160406c
parent 2e3a38a77468661f19d228977aa8fa2616d14a6a
author Benjamin Peterson <benjamin@python.org> 1306895283 -0500
committer Benjamin Peterson <benjamin@python.org> 1306895283 -0500
HG:rename-source hg

merge 3.2