From: Éric Araujo <merwok@netwok.org>
Date: Sun, 29 May 2011 15:56:20 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.1.4rc1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4427bf9c9ff096ab10589b7aba1e2a6f9c3093f;p=python

Branch merge
---

e4427bf9c9ff096ab10589b7aba1e2a6f9c3093f