From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sun, 13 May 2012 09:01:36 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a4~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=708d88c33441b29760b9246d61844eb59c1d0f3a;p=python

merge with 3.2
---

708d88c33441b29760b9246d61844eb59c1d0f3a