From: Éric Araujo <merwok@netwok.org>
Date: Tue, 9 Aug 2011 16:09:21 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1734
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18205baf251495b5a54b08c1f9b0e1763eb27aa1;p=python

Merge 3.2
---

18205baf251495b5a54b08c1f9b0e1763eb27aa1