From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 3 Sep 2015 09:50:51 +0000 (-0700)
Subject: merge heads.
X-Git-Tag: v2.7.11rc1~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c97e18ec6421491e40dcebb3b0dd13cbe1bcd9d5;p=thirdparty%2FPython%2Fcpython.git

merge heads.
---

c97e18ec6421491e40dcebb3b0dd13cbe1bcd9d5