From: Petri Lehtinen <petri@digip.org>
Date: Wed, 1 Feb 2012 20:20:41 +0000 (+0200)
Subject: Merge branch 3.2
X-Git-Tag: v3.3.0a1~269^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8940f6242c27fa1c3349503f71903b2b79069994;p=thirdparty%2FPython%2Fcpython.git

Merge branch 3.2

Closes #13676.
---

8940f6242c27fa1c3349503f71903b2b79069994