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

Merge 3.2
---

ce2808cca6c32549510abc5b4704d18d0acdba36