From: Georg Brandl <georg@python.org>
Date: Wed, 4 Apr 2012 18:17:27 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a3~315
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4dc6dc9e7e1fc1708c243b308a27e2faf59a3ea;p=thirdparty%2FPython%2Fcpython.git

merge with 3.2
---

d4dc6dc9e7e1fc1708c243b308a27e2faf59a3ea