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

Branch merge
---

ad0790e5730173a6c649b59ae035549e3f2ba481