From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 10 Jun 2011 16:33:58 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v2.7.3rc1~695
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b30d5c711e0fbcc8e4976210e09455a74236e8d3;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

b30d5c711e0fbcc8e4976210e09455a74236e8d3