tree a02fa7b73444ccb088226f7a0c7d1f354889feab
parent fadeeffe5b7184c5406ee64e46550bc90395e8f7
parent c704378987a8347d628b6c0f4c302ecda6d757d0
author Benjamin Peterson <benjamin@python.org> 1304299499 -0500
committer Benjamin Peterson <benjamin@python.org> 1304299499 -0500
HG:rename-source hg

merge 3.2