From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 15 May 2012 16:07:55 +0000 (+0800)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~823
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7cf222229e891cdab269b897ac4b76b637f16fec;p=python

merge heads
---

7cf222229e891cdab269b897ac4b76b637f16fec