From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sun, 12 Aug 2012 08:25:10 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0rc1~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=131160c5ccda7eb90c38d998a3b446e99a19ccff;p=python

merge with 3.2
---

131160c5ccda7eb90c38d998a3b446e99a19ccff