From: Éric Araujo <merwok@netwok.org>
Date: Mon, 1 Aug 2011 12:43:45 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.2rc1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ffea0e8d7f93675e60a3afd85d0f7f8861a8978;p=python

Branch merge
---

2ffea0e8d7f93675e60a3afd85d0f7f8861a8978