From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Tue, 3 Jan 2012 17:37:46 +0000 (+0100)
Subject: merge with 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c91242f881f4496034c4b452d5fcc74f66206c8;p=python

merge with 3.2
---

5c91242f881f4496034c4b452d5fcc74f66206c8