From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sun, 19 Feb 2012 11:30:47 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=488a56d2fb3697539fdd6b44df378954066924fe;p=python

merge with 3.2
---

488a56d2fb3697539fdd6b44df378954066924fe