From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 9 Aug 2011 21:15:29 +0000 (-0500)
Subject: merge 3.2 (#12719)
X-Git-Tag: v3.3.0a1~1729
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9aae3a8cf557256e1f7a46f0ba19581949b5a805;p=python

merge 3.2 (#12719)
---

9aae3a8cf557256e1f7a46f0ba19581949b5a805