From: Éric Araujo <merwok@netwok.org>
Date: Tue, 4 Oct 2011 23:52:45 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1290^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1079bdfde3bdd2100f1f8ef1b217a2d00529d7a7;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

1079bdfde3bdd2100f1f8ef1b217a2d00529d7a7