tree 21a57ee1be4956279e3f6aa23cef63a957a74baa
parent cb9c5ba73673be215e10368d160c173788d58e15
parent 532c363ac775c5499f9f00a06c84c7b1a5c4f337
author Barry Warsaw <barry@python.org> 1318014938 -0400
committer Barry Warsaw <barry@python.org> 1318014938 -0400
HG:rename-source hg

Trunk merge