From: Éric Araujo <merwok@netwok.org>
Date: Thu, 3 Nov 2011 15:45:33 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~966
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fc41dd1e34a25298f867110a0f408b2d27e2a3f;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

6fc41dd1e34a25298f867110a0f408b2d27e2a3f