From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 28 Apr 2011 09:08:41 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ea72709a34e57c9c131d7006ea80bdefbcf7bfe;p=python

merge from 3.2
---

2ea72709a34e57c9c131d7006ea80bdefbcf7bfe