From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 14 Apr 2011 04:58:32 +0000 (+0800)
Subject: merge the changes.
X-Git-Tag: v2.7.2rc1~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e57666a99017646fae1ee072119b5fc7fa94b6ed;p=thirdparty%2FPython%2Fcpython.git

merge the changes.
---

e57666a99017646fae1ee072119b5fc7fa94b6ed