From: Senthil Kumaran <orsenthil@gmail.com>
Date: Tue, 12 Apr 2011 23:24:32 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2608
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cea9a0227213d1ad914e1d6ce69acf5792756f5;p=python

merge from 3.2
---

1cea9a0227213d1ad914e1d6ce69acf5792756f5