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

Merge 3.4 (#16716)
---

a7906dd2d9fa19b9722d81e8d53fcc855bc8f8c0