From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Apr 2012 17:20:49 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~294^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1b34a36f81d6fad6474e51f569f82c39e89d1c0;p=python

merge 3.2
---

c1b34a36f81d6fad6474e51f569f82c39e89d1c0