From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 28 Oct 2011 09:32:53 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.2.3rc1~469
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b85cd06808cf9b865f91b3cf00796ab3f87914a;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

0b85cd06808cf9b865f91b3cf00796ab3f87914a