From: Éric Araujo <merwok@netwok.org>
Date: Wed, 1 Jun 2011 17:47:24 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5397c797f4ca1d958430edff1ff04a91a813a5ec;p=python

Merge 3.2
---

5397c797f4ca1d958430edff1ff04a91a813a5ec