From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 13 Apr 2011 01:37:39 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2604
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00a47b858887abb5b34f9c62c31185d833ded6a4;p=python

merge from 3.2
---

00a47b858887abb5b34f9c62c31185d833ded6a4