From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 29 Jun 2011 02:58:27 +0000 (-0500)
Subject: merge 2.6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a48f4f4b81bef36d5637a32d3d8e50f530b9569d;p=python

merge 2.6
---

a48f4f4b81bef36d5637a32d3d8e50f530b9569d