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

Merge 3.2
---

46a9d62828bb1179dc718fb0ac24e7db5e8fa39f