From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 6 Apr 2011 06:16:08 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2656
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=736975a77168aa90ab4b5bb1e56c31fd3ab26934;p=python

merge from 3.2
---

736975a77168aa90ab4b5bb1e56c31fd3ab26934