From: Senthil Kumaran <orsenthil@gmail.com>
Date: Fri, 15 Apr 2011 10:22:05 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2584
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b496159603e5cc31904a894166ecce52fea01a1c;p=python

merge from 3.2
---

b496159603e5cc31904a894166ecce52fea01a1c