From: Senthil Kumaran <senthil@uthcode.com>
Date: Mon, 20 Jun 2011 00:00:29 +0000 (-0700)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2088^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=110cac15232182ae32deb0bad1fbc63a2320e23d;p=python

merge from 3.2
---

110cac15232182ae32deb0bad1fbc63a2320e23d