From: Barry Warsaw <barry@python.org>
Date: Wed, 22 Feb 2012 18:39:59 +0000 (-0500)
Subject: null merge from 2.6
X-Git-Tag: v2.7.3rc1~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa5d224a20d33c09d01ea4218d8631beb174b2d2;p=thirdparty%2FPython%2Fcpython.git

null merge from 2.6
---

fa5d224a20d33c09d01ea4218d8631beb174b2d2