From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 29 Jun 2011 02:58:27 +0000 (-0500)
Subject: merge 2.6
X-Git-Tag: v2.7.3rc1~652^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a48f4f4b81bef36d5637a32d3d8e50f530b9569d;p=thirdparty%2FPython%2Fcpython.git

merge 2.6
---

a48f4f4b81bef36d5637a32d3d8e50f530b9569d