From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 13 Apr 2011 01:21:42 +0000 (+0800)
Subject: merge from 3.1
X-Git-Tag: v3.2.1b1~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dc605735d26230e3c5ebf79db8637bb041e9ee0;p=python

merge from 3.1
---

6dc605735d26230e3c5ebf79db8637bb041e9ee0