From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 20 May 2011 16:41:59 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1rc2~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7dd737ef712b9b847dae35422ce3c64efc3d580;p=python

merge 3.1
---

c7dd737ef712b9b847dae35422ce3c64efc3d580