From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 15 Jan 2013 13:32:49 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v2.7.4rc1~243
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdea5ec574bb456b4d8ca576cdd4752161f03497;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

bdea5ec574bb456b4d8ca576cdd4752161f03497