From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Wed, 31 Oct 2012 20:05:46 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.2.4rc1~387
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01e1e35f6a097fae894e5e96528ae22cea997de3;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

01e1e35f6a097fae894e5e96528ae22cea997de3