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

merge 3.2
---

e9f72dbf0d857d166626f7fc2713c07a67db1643