From: Éric Araujo <merwok@netwok.org>
Date: Fri, 29 Jul 2011 16:10:12 +0000 (+0200)
Subject: Merge from 3.2 (#9254, #8982, #9788)
X-Git-Tag: v3.3.0a1~1814
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=516c51c14c06913ac832b0f50989e83c6f3bb730;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2 (#9254, #8982, #9788)
---

516c51c14c06913ac832b0f50989e83c6f3bb730