From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 26 Jan 2014 17:36:59 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.4.0rc1~229^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=252fd0c24b15e38c80053a9569272654fd12868a;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

252fd0c24b15e38c80053a9569272654fd12868a