From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 18:22:25 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~710
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=591c9214110d1004032c61b00e47ad0805947ef2;p=python

merge 3.2
---

591c9214110d1004032c61b00e47ad0805947ef2