From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 10 Jun 2011 16:33:41 +0000 (-0500)
Subject: merge 2.7.2 release branch with fix for #12009
X-Git-Tag: v2.7.3rc1~696
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b8162d868114bd47d176c6c49c51a5d54d41e12;p=python

merge 2.7.2 release branch with fix for #12009
---

8b8162d868114bd47d176c6c49c51a5d54d41e12