From: Éric Araujo <merwok@netwok.org>
Date: Mon, 2 May 2011 11:36:18 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.2rc1~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfa8483051554b0e300b4b0c4a84c65bd2819cd3;p=python

Branch merge
---

cfa8483051554b0e300b4b0c4a84c65bd2819cd3