From: Éric Araujo <merwok@netwok.org>
Date: Fri, 29 Jul 2011 12:34:51 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1818
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ef771f18f56fd3230d8c1b8d3c9ba98293e9174;p=python

Merge 3.2
---

8ef771f18f56fd3230d8c1b8d3c9ba98293e9174