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

merge with 3.2
---

2e64a0b6ff7a462c1c4d9089d9681993ff589b16