From: Georg Brandl <georg@python.org>
Date: Wed, 10 Oct 2012 14:49:11 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~810
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a36a1ee4cfbff5ca4029b61c18a921ad1c45fc19;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

a36a1ee4cfbff5ca4029b61c18a921ad1c45fc19