From: Senthil Kumaran <senthil@uthcode.com>
Date: Sun, 8 Jul 2012 09:22:44 +0000 (-0700)
Subject: merge heads.
X-Git-Tag: v2.7.4rc1~711
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7d4b607f16ad1116cc6fe4c00cc344c3f2cbe79;p=thirdparty%2FPython%2Fcpython.git

merge heads.
---

e7d4b607f16ad1116cc6fe4c00cc344c3f2cbe79