From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 8 Apr 2014 14:49:09 +0000 (-0400)
Subject: merge 3.4 (#16395)
X-Git-Tag: v3.5.0a1~1928
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2deef0cf31504041bad3182e8dcf9145318c27a4;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#16395)
---

2deef0cf31504041bad3182e8dcf9145318c27a4