From: Georg Brandl <georg@python.org>
Date: Sat, 13 Aug 2011 09:54:33 +0000 (+0200)
Subject: Merge with cpython.
X-Git-Tag: v3.2.2rc1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d88e5af061c4c3206699fe7b86e736c42fdeba1c;p=thirdparty%2FPython%2Fcpython.git

Merge with cpython.
---

d88e5af061c4c3206699fe7b86e736c42fdeba1c