tree 83ab157488dd364de2a26b453c34e6ce7cc29537
parent 388c0e2325f606d497ec174a4a6b28c4d352db2c
parent 7f5556095eed7383e98c24766aa302c5e473abc1
author Benjamin Peterson <benjamin@python.org> 1315310263 -0400
committer Benjamin Peterson <benjamin@python.org> 1315310263 -0400
HG:rename-source hg

merge 3.2