From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 20 Mar 2012 20:10:36 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4dcb1051441a63ec13aa263484b20d64b935a4b;p=python

merge 3.2
---

b4dcb1051441a63ec13aa263484b20d64b935a4b