From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Sat, 13 Oct 2012 03:31:50 +0000 (-0700)
Subject: Merge from 3.3: Undo changes accidentally reverted in de8787029fe4.
X-Git-Tag: v3.4.0a1~2261^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=145fb897f2c3891669d84512cdfd108253da9466;p=python

Merge from 3.3: Undo changes accidentally reverted in de8787029fe4.
---

145fb897f2c3891669d84512cdfd108253da9466