tree 96f95119eac5d9fc184d7c9c8adbeb31d445f1c8
parent 2ebada4233bdc1b25a83800a9040a43ccfe0bed4
parent dac7de31023980d82501a8a2aa4af0c55beedca4
author Barry Warsaw <barry@python.org> 1311117925 -0400
committer Barry Warsaw <barry@python.org> 1311117925 -0400
HG:rename-source hg

Upstream merge.