From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 31 Mar 2014 21:41:04 +0000 (+0300)
Subject: Merge 3.4 (#16716)
X-Git-Tag: v3.5.0a1~1975
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4dae7e6abb9d66124e39acf9b6981e248ea32f6;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 (#16716)
---

a4dae7e6abb9d66124e39acf9b6981e248ea32f6