From: Éric Araujo <merwok@netwok.org>
Date: Tue, 15 Nov 2011 15:12:22 +0000 (+0100)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~840
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f2ba3bd864d0ca606ff1b96989d7d62905292dd;p=python

Branch merge
---

3f2ba3bd864d0ca606ff1b96989d7d62905292dd