tree 2f9b409fe79d26696734708bc2062e5d63b075ab
parent e3c3f24736ac26369c9562a8823a19a7420f59db
parent fee3fc748e4c6e00cdd44c079e54cacef00690cf
author Benjamin Peterson <benjamin@python.org> 1333681030 -0400
committer Benjamin Peterson <benjamin@python.org> 1333681030 -0400
HG:rename-source hg

merge 3.2