From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 24 Jan 2013 14:39:55 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~1544^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47c2975059546b1f9e0cd8b3c115cbfdc4197720;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

47c2975059546b1f9e0cd8b3c115cbfdc4197720