From: Éric Araujo <merwok@netwok.org>
Date: Fri, 12 Aug 2011 16:03:30 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1711
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f04488e2baea6bd539e90765eee98a0151e90574;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

f04488e2baea6bd539e90765eee98a0151e90574