From: Senthil Kumaran <senthil@uthcode.com>
Date: Sun, 31 Jul 2011 03:50:15 +0000 (+0800)
Subject: merge heads.
X-Git-Tag: v2.7.3rc1~552
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d741d2b2abc02554c58befa8df19cdeeecdc8f6f;p=python

merge heads.
---

d741d2b2abc02554c58befa8df19cdeeecdc8f6f