From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 18 Aug 2011 18:55:38 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1679
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea35d39a24281b8c3f3721ea64603035f30012a7;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

ea35d39a24281b8c3f3721ea64603035f30012a7