From: Senthil Kumaran <senthil@uthcode.com>
Date: Sun, 19 Jun 2011 20:56:56 +0000 (-0700)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~2092
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ae34b46c74fec60832310c9bd0a65db7f743966;p=python

merge from 3.2
---

8ae34b46c74fec60832310c9bd0a65db7f743966