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

merge 3.2
---

ff40aa7b34d144bfd2822d1d7eed42f68ce17831