From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 23 May 2011 22:03:33 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.3.0a1~2183^2~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9100721e9057d6332a5e5c97e134d80173aedd0;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

a9100721e9057d6332a5e5c97e134d80173aedd0