From: Éric Araujo <merwok@netwok.org>
Date: Sun, 24 Apr 2011 00:49:10 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2488^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92952cc1814bff0af455d79371ef5554d242a93e;p=python

Merge 3.2
---

92952cc1814bff0af455d79371ef5554d242a93e