From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 3 Jun 2011 21:17:48 +0000 (-0500)
Subject: merge 2.7.2 release branch
X-Git-Tag: v2.7.3rc1~703
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d571cf5ab089bf00c51401b97d15b21206515218;p=python

merge 2.7.2 release branch
---

d571cf5ab089bf00c51401b97d15b21206515218