From: Barry Warsaw <barry@python.org>
Date: Sat, 17 Mar 2012 22:23:22 +0000 (-0400)
Subject: null merge from 2.6
X-Git-Tag: v2.7.4rc1~958^2~3^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91c4f29a1a877af5ee374cac0af155cfacdd7eb3;p=thirdparty%2FPython%2Fcpython.git

null merge from 2.6
---

91c4f29a1a877af5ee374cac0af155cfacdd7eb3