From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 28 Apr 2011 07:53:59 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2479
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7274828b482ea95ded057f21b9dd2d11967a6a91;p=python

merge from 3.2
---

7274828b482ea95ded057f21b9dd2d11967a6a91