From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 6 Nov 2012 22:51:42 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~2065
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd81709b9e60fe8c814a18d59186208c3ccbdacc;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

cd81709b9e60fe8c814a18d59186208c3ccbdacc