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

merge with 3.2
---

5bb665f00cbd9522839dfd53c386c7e1a62acfa5