From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 24 Nov 2013 18:56:23 +0000 (+0100)
Subject: Merge from 3.3.
X-Git-Tag: v3.4.0b2~507^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=daa96b7669e79882c0e4979902b25a0614a4585a;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3.
---

daa96b7669e79882c0e4979902b25a0614a4585a