From: Éric Araujo <merwok@netwok.org>
Date: Thu, 26 May 2011 14:49:59 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.1.4rc1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dec2067b2a5fe4ae47ce67a55810885e6f0ae20b;p=python

Branch merge
---

dec2067b2a5fe4ae47ce67a55810885e6f0ae20b