From: Michael Foord <michael@python.org>
Date: Tue, 15 Mar 2011 22:38:41 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a1~2898^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72d46933368f0ee192d50e421b1648af5c0adf51;p=thirdparty%2FPython%2Fcpython.git

merge
---

72d46933368f0ee192d50e421b1648af5c0adf51