From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 3 Nov 2012 19:18:57 +0000 (+0200)
Subject: Merge heads.
X-Git-Tag: v2.7.4rc1~412
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e2005dc0d42e98c3ab9634fb5d01eabf4f80e7a;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

4e2005dc0d42e98c3ab9634fb5d01eabf4f80e7a