From: Georg Brandl <georg@python.org>
Date: Sun, 28 Oct 2012 07:06:11 +0000 (+0100)
Subject: merge with 2.6
X-Git-Tag: v2.7.4rc1~446
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=819574a226057d8de8ed4b8f92bdd0cf6defb458;p=thirdparty%2FPython%2Fcpython.git

merge with 2.6
---

819574a226057d8de8ed4b8f92bdd0cf6defb458