From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 27 Jun 2011 14:15:19 +0000 (-0500)
Subject: merge 3.2 (#12417)
X-Git-Tag: v3.3.0a1~2039
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68151d4f7fa783945ce904ad2eaced396daa49d1;p=python

merge 3.2 (#12417)
---

68151d4f7fa783945ce904ad2eaced396daa49d1