From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 8 Apr 2014 18:58:35 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~1922
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e6fdc56d9385de81d0fff6a90dc5ca0abbaa557;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

0e6fdc56d9385de81d0fff6a90dc5ca0abbaa557