From: Senthil Kumaran <orsenthil@gmail.com>
Date: Tue, 26 Apr 2011 13:12:48 +0000 (+0800)
Subject: merge from 2.7
X-Git-Tag: v3.3.0a1~2507
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d27988d88d78400e1ab893d15a815d1b8cd3bae5;p=thirdparty%2FPython%2Fcpython.git

merge from 2.7
---

d27988d88d78400e1ab893d15a815d1b8cd3bae5