From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 15:13:50 +0000 (-0400)
Subject: merge 3.3 (#19114)
X-Git-Tag: v3.4.0a4~311^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5395d211f913d88268137f31f09155e9eb996fe8;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19114)
---

5395d211f913d88268137f31f09155e9eb996fe8