From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 3 Aug 2013 16:28:28 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.4.0a2~313^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e633bed44a6354dd190c7e97e28c12dead787315;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

e633bed44a6354dd190c7e97e28c12dead787315