From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Fri, 11 Jan 2013 09:49:28 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.1rc1~384
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a525fc161a6f42be60fa857e783606fe66e8305b;p=python

merge with 3.2
---

a525fc161a6f42be60fa857e783606fe66e8305b