From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 17 Dec 2012 17:07:57 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~299
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80ab6c53c6d90c0fae3828e5888d864d44b1c2ca;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

80ab6c53c6d90c0fae3828e5888d864d44b1c2ca