From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 31 May 2012 14:03:49 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0b1~332
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ef17954ccc8530a32c359029e48c79af6fb0935;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

1ef17954ccc8530a32c359029e48c79af6fb0935