From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Oct 2011 18:24:59 +0000 (-0400)
Subject: merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cebc207ea415f96a56f23b520adddeda3364fdc;p=python

merge 3.2
---

1cebc207ea415f96a56f23b520adddeda3364fdc