From: Gregory P. Smith <greg@krypto.org>
Date: Wed, 14 Mar 2012 21:58:50 +0000 (-0700)
Subject: merge (no change needed in 3.2)
X-Git-Tag: v3.3.0a2~191^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bca49772165f307d836a834089f62a6de8b2cb9;p=thirdparty%2FPython%2Fcpython.git

merge (no change needed in 3.2)
---

0bca49772165f307d836a834089f62a6de8b2cb9