From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Tue, 14 Aug 2012 17:52:04 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0rc1~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=488cc36123dc57bbb261f97592ec89d02e019f9a;p=python

merge with 3.2
---

488cc36123dc57bbb261f97592ec89d02e019f9a