From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 8 Nov 2012 08:11:22 +0000 (+0200)
Subject: Merge heads.
X-Git-Tag: v3.2.4rc1~363
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44dbd07a5187983cf531fa73c6dd145bfd325346;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

44dbd07a5187983cf531fa73c6dd145bfd325346