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

Merge.
---

8198f5d58e3ff16b6c201ff3e512cea9bed5a3fc