From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 20 Oct 2011 16:45:39 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.3.0a1~1116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9927e0ce351f7eb0157d13ba6cc8978d3e594948;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

9927e0ce351f7eb0157d13ba6cc8978d3e594948