From: Éric Araujo <merwok@netwok.org>
Date: Mon, 8 Aug 2011 14:56:46 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1735^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9ef4a08b26783f82e0a0bbfaeedb7f2aad1d679;p=python

Merge 3.2
---

a9ef4a08b26783f82e0a0bbfaeedb7f2aad1d679