From: Éric Araujo <merwok@netwok.org>
Date: Sat, 20 Aug 2011 05:10:54 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1662^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9322aabaa32df09af0bfcd317d1a860fb47a675;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

c9322aabaa32df09af0bfcd317d1a860fb47a675