From: Frank Wierzbicki <fwierzbicki@gmail.com>
Date: Wed, 16 Jan 2013 21:58:14 +0000 (-0800)
Subject: #16886: merge with 3.3
X-Git-Tag: v3.4.0a1~1592
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1572db5a09bf0fec00076408288a732dc45bf37c;p=python

#16886: merge with 3.3
---

1572db5a09bf0fec00076408288a732dc45bf37c