From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 8 Mar 2011 04:51:59 +0000 (-0600)
Subject: merge 3.1
X-Git-Tag: v3.2.1b1~336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b59f332b62770f0659fe2cb38b80cc7c7944056;p=python

merge 3.1
---

3b59f332b62770f0659fe2cb38b80cc7c7944056