From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 28 Mar 2014 22:55:04 +0000 (-0400)
Subject: merge 3.4 (#21089)
X-Git-Tag: v3.5.0a1~2006
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9effd1f5fb814fcdb6e8072e2afbf841bdb19d61;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21089)
---

9effd1f5fb814fcdb6e8072e2afbf841bdb19d61