From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 9 Jul 2012 04:15:14 +0000 (-0400)
Subject: Merge with 3.2 Issue 12510
X-Git-Tag: v3.3.0b2~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc4cffb8fad2341fcdf49d8a47cb7adcf71aa38b;p=python

Merge with 3.2 Issue 12510
---

cc4cffb8fad2341fcdf49d8a47cb7adcf71aa38b