From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Sep 2014 03:02:35 +0000 (-0400)
Subject: merge 3.3 (#22520)
X-Git-Tag: v3.4.3rc1~597
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43030ee78041455566e7f78d6d5135eaa3455294;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#22520)
---

43030ee78041455566e7f78d6d5135eaa3455294