From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 16 Jan 2014 13:43:22 +0000 (+0100)
Subject: Merge from 3.3.
X-Git-Tag: v3.4.0b3~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7936c81d517fa0165b14d893a946855d2cb48fa1;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3.
---

7936c81d517fa0165b14d893a946855d2cb48fa1