From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 3 Jun 2012 05:06:38 +0000 (-0400)
Subject: Merge with 3.2 #12510
X-Git-Tag: v3.3.0b1~296^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a317eef8975f8ffef0938be32e5c85dc0bd3076f;p=python

Merge with 3.2 #12510
---

a317eef8975f8ffef0938be32e5c85dc0bd3076f