From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 26 Apr 2012 04:27:06 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a3~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fa47ebafedaf1aef4480bc115b182a62efb79e1;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

9fa47ebafedaf1aef4480bc115b182a62efb79e1