From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 15 Sep 2013 00:00:42 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.4.0a3~63^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a32d92bffc9c845253718c43e7ae91cf62bacda;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

0a32d92bffc9c845253718c43e7ae91cf62bacda