From: Georg Brandl <georg@python.org>
Date: Tue, 21 Feb 2012 21:38:31 +0000 (+0100)
Subject: merge with 2.6
X-Git-Tag: v2.7.3rc1~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66e565ee4825541e7bd9e544dcf8cefa999907f7;p=thirdparty%2FPython%2Fcpython.git

merge with 2.6
---

66e565ee4825541e7bd9e544dcf8cefa999907f7