From: Éric Araujo <merwok@netwok.org>
Date: Fri, 3 Jun 2011 17:27:16 +0000 (+0200)
Subject: Merge #12249 fix from 3.2
X-Git-Tag: v3.3.0a1~2183^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61c4372ce100dc5a19d3425fd44ea8061f2e1eaa;p=thirdparty%2FPython%2Fcpython.git

Merge #12249 fix from 3.2
---

61c4372ce100dc5a19d3425fd44ea8061f2e1eaa