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

merge 2.7.2 release branch
---

1dc4a828e9f272de07cb2885dec5c9b8fcad8003