From: Ned Deily <nad@acm.org>
Date: Tue, 29 May 2012 17:51:38 +0000 (-0700)
Subject: Issue #10997: merge from 3.2
X-Git-Tag: v3.3.0a4~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01d63a6e06103c491aeccb0d8546323b09187406;p=python

Issue #10997: merge from 3.2
---

01d63a6e06103c491aeccb0d8546323b09187406