From: Ned Deily <nad@acm.org>
Date: Thu, 6 Oct 2011 21:24:31 +0000 (-0700)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~1269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94030712770513a26bbe80346168b340dc6a16f3;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2
---

94030712770513a26bbe80346168b340dc6a16f3