From: Éric Araujo <merwok@netwok.org>
Date: Thu, 26 May 2011 14:51:18 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7cbbcd8c105d97277f50e61f2ddf8b8e5099a076;p=python

Merge 3.2
---

7cbbcd8c105d97277f50e61f2ddf8b8e5099a076