From: Stefan Krah <skrah@bytereef.org>
Date: Fri, 30 Mar 2012 12:19:21 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e257550063a99bc54fea1696ed8fdd8542eb52a;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

1e257550063a99bc54fea1696ed8fdd8542eb52a