From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jun 2011 14:51:21 +0000 (-0500)
Subject: merge 2.7.2 release branch
X-Git-Tag: v2.7.3rc1~694
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a573e0df36101328730fa234c66a8df3a7d65180;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.2 release branch
---

a573e0df36101328730fa234c66a8df3a7d65180