From: Éric Araujo <merwok@netwok.org>
Date: Fri, 19 Aug 2011 12:23:47 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1673
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1da71cc26f145f230dfda79db0f515218f145ea;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

e1da71cc26f145f230dfda79db0f515218f145ea