From: Éric Araujo <merwok@netwok.org>
Date: Fri, 26 Aug 2011 14:39:26 +0000 (+0200)
Subject: Merge from 3.2 (change already committed in py3k)
X-Git-Tag: v3.3.0a1~1613
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=811afe9b0562512105dd145ac21394eda0509efa;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2 (change already committed in py3k)
---

811afe9b0562512105dd145ac21394eda0509efa