From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 13 Feb 2014 08:49:30 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.4.1rc1~233^2~331
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=422794767bbd91f3807a483c7862189b2acc0c60;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

422794767bbd91f3807a483c7862189b2acc0c60