From: Éric Araujo <merwok@netwok.org>
Date: Sun, 24 Apr 2011 00:42:52 +0000 (+0200)
Subject: Merge 3.1
X-Git-Tag: v3.2.1b1~71^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbeb1a94681d9921e9169e991504584eef4501a9;p=python

Merge 3.1
---

fbeb1a94681d9921e9169e991504584eef4501a9