From: Andrew Kuchling <amk@amk.ca>
Date: Mon, 14 Apr 2014 17:52:34 +0000 (-0400)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0a1~1887
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f54b2bf710a2d7653090b54f50c2874104653dc;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.4
---

7f54b2bf710a2d7653090b54f50c2874104653dc