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

merge 3.2
---

dd6098b8a1c0e5ccda4c621b080960cfcf2c8cab