From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 4 Sep 2011 22:17:49 +0000 (+0200)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a1~1570^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c2d2aedd5c48a5fbbbb4a238b7d4e86a5f64b60;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2
---

2c2d2aedd5c48a5fbbbb4a238b7d4e86a5f64b60