From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 19 Mar 2012 01:23:22 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~958
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e79499504e82e92d9aa163d18cd25a81959b0db6;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

e79499504e82e92d9aa163d18cd25a81959b0db6