From: Éric Araujo <merwok@netwok.org>
Date: Mon, 6 Jun 2011 15:11:47 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.2rc1~242
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b52f957977f450613c6eafdc9216ae7993d4d49;p=python

Branch merge
---

5b52f957977f450613c6eafdc9216ae7993d4d49