From: Barry Warsaw <barry@python.org>
Date: Tue, 21 Feb 2012 16:19:00 +0000 (-0500)
Subject: merge 2.7
X-Git-Tag: v2.7.3rc1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbe0329d4c7f31618d913a1e8c233239e05a54eb;p=python

merge 2.7
---

dbe0329d4c7f31618d913a1e8c233239e05a54eb