From: Éric Araujo <merwok@netwok.org>
Date: Wed, 20 Apr 2011 17:23:26 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.1b1~71^2~4^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f205ed37eb4b785b60081f957d515ca16b0db47;p=python

Branch merge
---

6f205ed37eb4b785b60081f957d515ca16b0db47