From: Senthil Kumaran <senthil@uthcode.com>
Date: Sun, 19 Jun 2011 20:55:48 +0000 (-0700)
Subject: merge from 3.1 for issue issue12261.
X-Git-Tag: v3.2.1rc2~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a977acc0feabfe196f325321d7ea0c59bd9e64a4;p=thirdparty%2FPython%2Fcpython.git

merge from 3.1 for issue issue12261.
---

a977acc0feabfe196f325321d7ea0c59bd9e64a4