From: Michael Foord <michael@voidspace.org.uk>
Date: Sun, 18 Dec 2011 22:09:27 +0000 (+0000)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~565
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a699a2d0c1a59aeaea47f50701c40a1cff18e4b6;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

a699a2d0c1a59aeaea47f50701c40a1cff18e4b6