From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 19 Oct 2011 20:58:15 +0000 (-0400)
Subject: merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc37ce95e8979d5d9e9c0777910bf94080d29115;p=python

merge 3.2
---

dc37ce95e8979d5d9e9c0777910bf94080d29115