From: Senthil Kumaran <senthil@uthcode.com>
Date: Sat, 14 Jan 2012 10:39:23 +0000 (+0800)
Subject: merge from 3.2
X-Git-Tag: v3.3.0a1~414
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c3dd7ea42c20d8e71da79c81b6c0738311d7f2e;p=python

merge from 3.2
---

6c3dd7ea42c20d8e71da79c81b6c0738311d7f2e