From: Éric Araujo <merwok@netwok.org>
Date: Fri, 12 Aug 2011 17:53:13 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1708
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=147cd508bcfa3eb802c4745adb3a86225cba73f3;p=python

Merge 3.2
---

147cd508bcfa3eb802c4745adb3a86225cba73f3