From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 8 Dec 2012 12:24:23 +0000 (+1000)
Subject: Merge from 3.3 (Issue #15209)
X-Git-Tag: v3.4.0a1~1891
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10cdf99a90b6a4ff8b976a16ac9122d1a3354cbb;p=python

Merge from 3.3 (Issue #15209)
---

10cdf99a90b6a4ff8b976a16ac9122d1a3354cbb