From: Georg Brandl <georg@python.org>
Date: Sat, 29 Sep 2012 12:22:04 +0000 (+0200)
Subject: null-merge from 3.3
X-Git-Tag: v3.4.0a1~2475
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ede184996c925ef6f642aea7e673f19deb4d50d1;p=thirdparty%2FPython%2Fcpython.git

null-merge from 3.3
---

ede184996c925ef6f642aea7e673f19deb4d50d1