From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 8 Mar 2012 01:10:42 +0000 (-0600)
Subject: merge 3.2 (null)
X-Git-Tag: v3.3.0a2~262
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=704cae5097900283a9b59db000279d4cc07af2d1;p=python

merge 3.2 (null)
---

704cae5097900283a9b59db000279d4cc07af2d1