From: Senthil Kumaran <senthil@uthcode.com>
Date: Mon, 4 Jul 2011 18:44:17 +0000 (-0700)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~1954
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fbfc12f5e156e753f40853254ed3fb57be03639;p=python

merge from 3.2
---

8fbfc12f5e156e753f40853254ed3fb57be03639