From: Éric Araujo <merwok@netwok.org>
Date: Wed, 27 Apr 2011 14:27:38 +0000 (+0200)
Subject: Merge 3.1
X-Git-Tag: v3.2.1b1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=944d16c6c490f5e3933f8a729d810f60d3bab1d3;p=python

Merge 3.1
---

944d16c6c490f5e3933f8a729d810f60d3bab1d3