From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Sun, 4 Aug 2013 18:52:42 +0000 (-0400)
Subject: Merge.
X-Git-Tag: v3.4.0a2~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d4f94a739c95a971774e6a9e72dfee7c973303f;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

0d4f94a739c95a971774e6a9e72dfee7c973303f