From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Apr 2012 18:25:55 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~330
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbb290af08bc97ace72ca1a5ae19fd7375cae938;p=python

merge 3.2
---

cbb290af08bc97ace72ca1a5ae19fd7375cae938