tree 287d56155899a1cd0b7f68eb581e792ee3e4b792
parent 15ac3110883c7f6e5cde5dd308baf178e666b985
parent 1eb6d278a8139dda25efbe1b3509aac159bc54fd
author Benjamin Peterson <benjamin@python.org> 1306801543 -0500
committer Benjamin Peterson <benjamin@python.org> 1306801543 -0500
HG:rename-source hg

merge heads