From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sun, 19 Feb 2012 11:28:18 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ee86a15157b5b9e145dbf7c9b5a23fda60c8454;p=python

merge with 3.2
---

1ee86a15157b5b9e145dbf7c9b5a23fda60c8454