From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 7 Mar 2011 00:04:10 +0000 (-0600)
Subject: merge 3.1
X-Git-Tag: v3.2.1b1~339
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ae5cffb3abcf28c45ef6de2135aebc05bbbd9f5;p=python

merge 3.1
---

2ae5cffb3abcf28c45ef6de2135aebc05bbbd9f5