From: Georg Brandl <georg@python.org>
Date: Mon, 23 Jan 2012 19:19:46 +0000 (+0100)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~312^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b45a013bcd0afcd3be46f994e2f5c29d5447d1a;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2
---

5b45a013bcd0afcd3be46f994e2f5c29d5447d1a