From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 11 Jan 2013 07:06:12 +0000 (+0200)
Subject: Merge heads.
X-Git-Tag: v2.7.4rc1~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14091a6bcae3087e1202fbc7969ad2644d032688;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

14091a6bcae3087e1202fbc7969ad2644d032688