From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 11 Jul 2012 07:17:54 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.0b2~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa0989fd38b9e01ec62db7b1c6ed2847628913e4;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

fa0989fd38b9e01ec62db7b1c6ed2847628913e4