From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Jun 2011 00:01:23 +0000 (-0500)
Subject: merge 2.7.2 release branch
X-Git-Tag: v2.7.3rc1~712
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35a9b1ca1347400bb12e2af3d6b38f2549c5d9dc;p=python

merge 2.7.2 release branch
---

35a9b1ca1347400bb12e2af3d6b38f2549c5d9dc