From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 15 Apr 2014 20:41:36 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.5.0a1~1860
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27adf4469023597883d9240ad40a7a52d81b6f66;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

27adf4469023597883d9240ad40a7a52d81b6f66