From: Andrew Kuchling <amk@amk.ca>
Date: Tue, 12 Nov 2013 15:26:15 +0000 (-0500)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0b1~306
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6a140f330178ea8df83fae003ebbccc50b24a2c;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3
---

c6a140f330178ea8df83fae003ebbccc50b24a2c