From: Éric Araujo <merwok@netwok.org>
Date: Thu, 6 Oct 2011 11:23:50 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1289
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=207dc73ece527d96c2e3b0b0301d4c36a451bb26;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

207dc73ece527d96c2e3b0b0301d4c36a451bb26