From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 11:17:14 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~237
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfcd686acf9bc1b72fcd7fb4998cc40b301d56fc;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

cfcd686acf9bc1b72fcd7fb4998cc40b301d56fc