From: Stefan Krah <skrah@bytereef.org>
Date: Fri, 21 Dec 2012 22:27:13 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~1804
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fba5365d569637567807df10fa364e8107f8cd7;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

8fba5365d569637567807df10fa364e8107f8cd7