From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sun, 7 Oct 2012 16:22:50 +0000 (+0300)
Subject: merge heads
X-Git-Tag: v3.4.0a1~2309^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81901490a021048dc452c92839016732dc3c2e23;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

81901490a021048dc452c92839016732dc3c2e23