From: Georg Brandl <georg@python.org>
Date: Sat, 16 Apr 2011 14:59:48 +0000 (+0200)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a1~2574
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d606ebe144452fcdd0aa13ef2e9737df36b8cd63;p=python

Merge with 3.2
---

d606ebe144452fcdd0aa13ef2e9737df36b8cd63