From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Mar 2014 20:07:22 +0000 (-0500)
Subject: merge 3.3 (#19614)
X-Git-Tag: v3.4.1rc1~233^2~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8f3819567293bece741ae61b14564295025199b;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19614)
---

e8f3819567293bece741ae61b14564295025199b