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

merge heads
---

07d126f0def56eb369dbb9602ac922b8c6e0d032