From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 9 May 2011 06:10:38 +0000 (+0200)
Subject: merge 11164
X-Git-Tag: v3.2.1rc1~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=867754e3e3c907f87d1bb0282df628deb392cd62;p=thirdparty%2FPython%2Fcpython.git

merge 11164
---

867754e3e3c907f87d1bb0282df628deb392cd62