From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 3 Jun 2012 00:24:21 +0000 (-0400)
Subject: Merge with 3.2 #10365
X-Git-Tag: v3.3.0b1~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=361baaddcf11b3d51430491fba86a41c19d0d76f;p=python

Merge with 3.2 #10365
---

361baaddcf11b3d51430491fba86a41c19d0d76f