From: Eric V. Smith <eric@trueblade.com>
Date: Wed, 16 May 2012 00:46:06 +0000 (-0400)
Subject: Merge from 3.2.
X-Git-Tag: v3.3.0a4~153^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8e106babba7b54d38992ebed33ac3feb74b3cb5;p=python

Merge from 3.2.
---

c8e106babba7b54d38992ebed33ac3feb74b3cb5