From: Éric Araujo <merwok@netwok.org>
Date: Mon, 6 Jun 2011 15:13:08 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e67b1eab32f3f0e0b2a5979cc00c2f4605e3b7e4;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

e67b1eab32f3f0e0b2a5979cc00c2f4605e3b7e4