From: Andrew Kuchling <amk@amk.ca>
Date: Fri, 25 Apr 2014 13:35:26 +0000 (-0400)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0a1~1794
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c71241523a164fd631bd777b2bbc6f9af95f651;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.4
---

1c71241523a164fd631bd777b2bbc6f9af95f651