From: Éric Araujo <merwok@netwok.org>
Date: Fri, 19 Aug 2011 00:26:44 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.3rc1~503^2^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdb86f17bf4101b3702ef99e193cba15d882eb73;p=python

Branch merge
---

cdb86f17bf4101b3702ef99e193cba15d882eb73