From: Łukasz Langa <lukasz@langa.pl>
Date: Thu, 12 May 2011 14:46:30 +0000 (+0200)
Subject: Cleaned up a backward merge after fixes issue #12044.
X-Git-Tag: v3.3.0a1~2298
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3dba024d20bf373615f09e30ddcc5b1b3ff7c505;p=thirdparty%2FPython%2Fcpython.git

Cleaned up a backward merge after fixes issue #12044.
---

3dba024d20bf373615f09e30ddcc5b1b3ff7c505