From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 20 Oct 2011 16:43:24 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v2.7.3rc1~391
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44b866a6d389cc4887b1abe14a9fafe08d3ca32a;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

44b866a6d389cc4887b1abe14a9fafe08d3ca32a