From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 12 Mar 2012 16:28:36 +0000 (-0700)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~234^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09b4bd03f6fcb0c30a1e7bcc07e3647b6da6d410;p=python

merge 3.2
---

09b4bd03f6fcb0c30a1e7bcc07e3647b6da6d410