From: Gregory P. Smith <greg@krypto.org>
Date: Sat, 14 May 2011 22:26:35 +0000 (-0700)
Subject: merge heads.
X-Git-Tag: v3.2.1rc1~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=873cab28903eb6a9063b502d7e9fe9555fc0cfd7;p=thirdparty%2FPython%2Fcpython.git

merge heads.
---

873cab28903eb6a9063b502d7e9fe9555fc0cfd7