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

merge 3.2
---

e0029baba65d4f6a29998edb9de091f1ef66d6e0