From: Éric Araujo <merwok@netwok.org>
Date: Mon, 1 Aug 2011 15:31:12 +0000 (+0200)
Subject: Merge #12295 fix from 3.2
X-Git-Tag: v3.3.0a1~1785
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eec1ed81192e856ada3fab4d13aaea7d7a581f0a;p=thirdparty%2FPython%2Fcpython.git

Merge #12295 fix from 3.2
---

eec1ed81192e856ada3fab4d13aaea7d7a581f0a