From: Georg Brandl <georg@python.org>
Date: Sat, 17 Mar 2012 17:39:20 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a2~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eed59e8aa1edcdf688e3091c7ed8508b098acf01;p=python

merge with 3.2
---

eed59e8aa1edcdf688e3091c7ed8508b098acf01