From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sun, 12 Aug 2012 09:02:17 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0rc1~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e095aa6a4963fffe76ce2356d89e93ea845fa5c;p=python

merge with 3.2
---

9e095aa6a4963fffe76ce2356d89e93ea845fa5c