From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Fri, 19 Aug 2011 16:40:56 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~1670
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e35cf0770b9cecda2bd1e5a8e99ef8b333177a3;p=python

merge with 3.2
---

8e35cf0770b9cecda2bd1e5a8e99ef8b333177a3