From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 4 Aug 2011 16:09:57 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1751
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=087a2a951c6193074dfd05d3d777f47bef5da8e4;p=python

merge 3.2
---

087a2a951c6193074dfd05d3d777f47bef5da8e4