From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 18 Apr 2014 05:04:07 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1830
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e83236f396b39f58e09d012d4a73ccb044f4c350;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

e83236f396b39f58e09d012d4a73ccb044f4c350