From: Stefan Krah <skrah@bytereef.org>
Date: Sat, 14 Dec 2013 11:58:59 +0000 (+0100)
Subject: Merge from 3.3.
X-Git-Tag: v3.4.0b2~224
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ab9f7251916ae8d90eaea9ca9496cb2f355e12d;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3.
---

7ab9f7251916ae8d90eaea9ca9496cb2f355e12d