From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 28 May 2011 12:14:17 +0000 (+0200)
Subject: Nearly null-merge 2.5.6
X-Git-Tag: v2.7.2rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=609e36d88747ddc6e86800648f6972c61a8abfec;p=thirdparty%2FPython%2Fcpython.git

Nearly null-merge 2.5.6
---

609e36d88747ddc6e86800648f6972c61a8abfec