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

null merge from 2.6
---

adbcc4cf403d00084c4d7e91787020a65c63d8c1