From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sun, 25 Dec 2011 10:44:55 +0000 (+0100)
Subject: merge with 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53dd1065aec327198d38fcf3708524c8fa44260e;p=python

merge with 3.2
---

53dd1065aec327198d38fcf3708524c8fa44260e