From: Éric Araujo <merwok@netwok.org>
Date: Fri, 14 Oct 2011 15:38:10 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab7e2a4454a283cf1386c3d4690d77af9ef5189a;p=python

Merge 3.2
---

ab7e2a4454a283cf1386c3d4690d77af9ef5189a