From: Barry Warsaw <barry@python.org>
Date: Thu, 15 Mar 2012 00:18:46 +0000 (-0700)
Subject: merge 2.6
X-Git-Tag: v2.7.4rc1~966^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e236ad311371b4dddbecdf1fb39ad5af58cdbe34;p=python

merge 2.6
---

e236ad311371b4dddbecdf1fb39ad5af58cdbe34