From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 15 Jan 2013 13:33:09 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.3.1rc1~355
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d48526997d6c70386114904402ba64643ba8140;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

6d48526997d6c70386114904402ba64643ba8140