From: Éric Araujo <merwok@netwok.org>
Date: Sun, 20 Mar 2011 17:31:42 +0000 (+0100)
Subject: Merge from 3.1
X-Git-Tag: v3.3.0a1~2835^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d40248777b7221393525c0e0c6864d2f6054f50b;p=python

Merge from 3.1
---

d40248777b7221393525c0e0c6864d2f6054f50b