From: Senthil Kumaran <senthil@uthcode.com>
Date: Wed, 11 Jun 2014 13:19:47 +0000 (-0700)
Subject: merge from 3.4
X-Git-Tag: v3.5.0a1~1471
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38ee9afb34d8eb3fc7d080c447f245ab8369934d;p=python

merge from 3.4
---

38ee9afb34d8eb3fc7d080c447f245ab8369934d