From: Éric Araujo <merwok@netwok.org>
Date: Sun, 9 Oct 2011 04:33:54 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.3rc1~413
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ece7079b54d9a6700558210339df02e4586f698c;p=python

Branch merge
---

ece7079b54d9a6700558210339df02e4586f698c