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

Merge 3.2
---

4092e3653ce9bf35d22101732087e5b6ab4029c3