From: Éric Araujo <merwok@netwok.org>
Date: Fri, 12 Aug 2011 15:40:25 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.2rc1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28d39a0c08dfe7668ba3f9808068f37d6bbea752;p=python

Branch merge
---

28d39a0c08dfe7668ba3f9808068f37d6bbea752