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

merge 3.4
---

3ae4f992d7af38e5c667eb57a1882eaf04c3c2d9