tree 96f67acebb418ffad7ea3176a548ab19921b7ab9
parent bc75046bb3a8bd1e07547e99c8958c54ec16b9fb
parent c17a8dfaca76016202c49b2150c946f5ba70db29
author Tim Peters <tim@python.org> 1379277445 -0500
committer Tim Peters <tim@python.org> 1379277445 -0500

Null merge of 3.1 into 3.2

Changeset c39f42f46a05 left a dangling head on 3.1.