From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 9 Jun 2014 03:30:33 +0000 (+1000)
Subject: Issue #21569: merge from 3.4
X-Git-Tag: v3.5.0a1~1486
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f488512a8f95684efe60a0fa6422389fbcd2ef6;p=python

Issue #21569: merge from 3.4
---

9f488512a8f95684efe60a0fa6422389fbcd2ef6