From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 11 Aug 2011 01:25:45 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~1718^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b0a4d22c50ca73f715d3cdf2969e941a63a3468;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2
---

5b0a4d22c50ca73f715d3cdf2969e941a63a3468