From: Éric Araujo <merwok@netwok.org>
Date: Thu, 26 May 2011 14:50:31 +0000 (+0200)
Subject: Merge 3.1
X-Git-Tag: v3.2.1rc2~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5096f739b0acde489826d1ca5c18cb22fa51ed2;p=python

Merge 3.1
---

b5096f739b0acde489826d1ca5c18cb22fa51ed2