From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 14:48:39 +0000 (-0400)
Subject: merge 3.3 (#19126)
X-Git-Tag: v3.4.0a4~311^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=177d89ce90b5cfbe59488dddb3291ef8a1e1ef37;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19126)
---

177d89ce90b5cfbe59488dddb3291ef8a1e1ef37