From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 16 Mar 2014 20:56:24 +0000 (-0500)
Subject: merge 3.3 (#11448)
X-Git-Tag: v3.4.1rc1~233^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2221f666eba4a6f46f2095a801bc3e4bdbdb97d2;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#11448)
---

2221f666eba4a6f46f2095a801bc3e4bdbdb97d2