tree 0b88d0e7b16ca167432e8cb4b2185ff3579a30fd
parent 0dec1bfef98eff72540601fa081b17c33572895d
parent 8e8fbeae27e3fbfa80ad59fd2aeb563116e6a4c4
author Benjamin Peterson <benjamin@python.org> 1338620270 -0700
committer Benjamin Peterson <benjamin@python.org> 1338620270 -0700
HG:rename-source hg

merge 3.2