From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 8 Sep 2012 17:52:19 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.2.4rc1~561
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bdcdc235ed7f234e0e93d8518e02584b46e81e7;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

8bdcdc235ed7f234e0e93d8518e02584b46e81e7