From: Georg Brandl <georg@python.org>
Date: Sat, 16 Apr 2011 14:59:32 +0000 (+0200)
Subject: Merge with 3.1
X-Git-Tag: v3.2.1b1~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10fe23b4954890c0e414438e026d1b36610ee668;p=python

Merge with 3.1
---

10fe23b4954890c0e414438e026d1b36610ee668