From: Éric Araujo <merwok@netwok.org>
Date: Wed, 25 May 2011 16:22:11 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~2183^2~87^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f67a99fc982ebad6b489a319c2ac521d64ea11e;p=python

Branch merge
---

0f67a99fc982ebad6b489a319c2ac521d64ea11e