From: Éric Araujo <merwok@netwok.org>
Date: Fri, 2 Sep 2011 15:32:30 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1580
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f08f53e797848b6e2f5e7eeaf20f9dcaba3e28b;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

6f08f53e797848b6e2f5e7eeaf20f9dcaba3e28b