tree 2926e6846bf160cd1b9d572179acfc911a84699b
parent 799bd80d8afd89546a5ec9e93a63f34d3cd65a9f
parent 0224d4e6992fdc91d8c095c7657bfcd7ce7a07a8
author Benjamin Peterson <benjamin@python.org> 1314843394 -0400
committer Benjamin Peterson <benjamin@python.org> 1314843394 -0400
HG:rename-source hg

merge 3.2 (null)