From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Feb 2012 20:09:08 +0000 (-0500)
Subject: merge 2.6
X-Git-Tag: v2.7.3rc1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66471134190c4f33fbaa97b736078fe761be5635;p=python

merge 2.6
---

66471134190c4f33fbaa97b736078fe761be5635