From: Stefan Krah <skrah@bytereef.org>
Date: Fri, 8 Nov 2013 19:37:01 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0b1~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2199ea96c0c5b2dab8ce068298689f2bd84df54a;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

2199ea96c0c5b2dab8ce068298689f2bd84df54a