From: Brian Curtin <brian@python.org>
Date: Thu, 11 Aug 2011 01:34:20 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.3.0a1~1718
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c29966f3927caa6878e70596443a50a53e7ebf60;p=thirdparty%2FPython%2Fcpython.git

merge
---

c29966f3927caa6878e70596443a50a53e7ebf60