From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 2 Apr 2014 19:52:04 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1960
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f0218bebeca959392b9d50968cd7fb178610f83;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

9f0218bebeca959392b9d50968cd7fb178610f83