From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Sep 2012 15:53:30 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~818^2^2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3331a20464d7018e8e0b0f7710690dd1575be3b6;p=python

merge 3.2
---

3331a20464d7018e8e0b0f7710690dd1575be3b6