From: Éric Araujo <merwok@netwok.org>
Date: Thu, 6 Oct 2011 11:19:34 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.3rc1~423
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e954ecb9ba35d3d075bae423c964fa8a6771968c;p=python

Branch merge
---

e954ecb9ba35d3d075bae423c964fa8a6771968c