From: Éric Araujo <merwok@netwok.org>
Date: Mon, 2 May 2011 11:33:14 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2435^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f95f18048d897f4db27252ed9593df0999f58eec;p=python

Merge 3.2
---

f95f18048d897f4db27252ed9593df0999f58eec