From: Éric Araujo <merwok@netwok.org>
Date: Mon, 5 Sep 2011 15:45:07 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1570^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61a54b566220391a3f5f900ae0f4ffaafc894d12;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

61a54b566220391a3f5f900ae0f4ffaafc894d12