From: Andrew Kuchling <amk@amk.ca>
Date: Sun, 16 Feb 2014 17:18:17 +0000 (-0500)
Subject: Merge from 3.3
X-Git-Tag: v3.4.1rc1~233^2~315
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c77974e033aad72f28172dd3db3d24e3f039bb49;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3
---

c77974e033aad72f28172dd3db3d24e3f039bb49