From: Éric Araujo <merwok@netwok.org>
Date: Wed, 23 Mar 2011 03:53:10 +0000 (+0100)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~2786
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e84c4df786e9238ed80ff0435ffa053ef227a57a;p=python

Branch merge
---

e84c4df786e9238ed80ff0435ffa053ef227a57a