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

Merge from 3.2.
---

313fbe21068038099cc4e57ae4bcd9e8a06e8b43