From: Guido van Rossum <guido@python.org>
Date: Fri, 18 Apr 2014 16:13:12 +0000 (-0700)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~1825
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c3d67caf7b0869b51aa3538aff8c685f6e99b1f;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

2c3d67caf7b0869b51aa3538aff8c685f6e99b1f