From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 14 Aug 2012 15:42:54 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.3.0rc1~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c85951eb4c9b77f671a955f5c63e30f30a36980e;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

c85951eb4c9b77f671a955f5c63e30f30a36980e