From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sat, 7 Jan 2012 16:57:24 +0000 (+0100)
Subject: merge with 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e60857e91056e5bb4a22783c31eaa3153cac051;p=python

merge with 3.2
---

5e60857e91056e5bb4a22783c31eaa3153cac051