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

Merge 3.2
---

4c3124c2b94add8cc168ebe29aa47f0f7326d7d8