From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 20 Mar 2012 14:40:26 +0000 (-0400)
Subject: merge tag
X-Git-Tag: v2.7.4rc1~957^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02fa3b95717765efd8c7c75cc9571cb088093ce2;p=python

merge tag
---

02fa3b95717765efd8c7c75cc9571cb088093ce2