From: Andrew Kuchling <amk@amk.ca>
Date: Wed, 16 Apr 2014 01:21:56 +0000 (-0400)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0a1~1856
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42a17fa4fde35f214b18f4cd0f0c69e1117c4b8a;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.4
---

42a17fa4fde35f214b18f4cd0f0c69e1117c4b8a