From: Éric Araujo <merwok@netwok.org>
Date: Sun, 29 May 2011 16:07:12 +0000 (+0200)
Subject: Merge 3.1
X-Git-Tag: v3.2.1rc2~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75e86a678c460f8b2d50c4616402e0ccd879a289;p=python

Merge 3.1
---

75e86a678c460f8b2d50c4616402e0ccd879a289