From: Georg Brandl <georg@python.org>
Date: Sun, 14 Apr 2013 08:13:50 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~946
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf72c5e4ead0f37b01a1dd3c7db3e29a852df3c5;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

cf72c5e4ead0f37b01a1dd3c7db3e29a852df3c5