Null merge of 3.1 into 3.2

Changeset c39f42f46a05 left a dangling head on 3.1.
This commit is contained in:
Tim Peters 2013-09-15 15:37:25 -05:00
commit 945a251e4a

Diff Content Not Available