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

merge 3.3 (#19122)
---

96609b701e55734d1bab794cfab016816ac4336a