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

merge 3.2
---

cc58031d6a800647b0e37c8fa812bbe1200eac22