From: Frank Wierzbicki <fwierzbicki@gmail.com>
Date: Wed, 16 Jan 2013 21:56:54 +0000 (-0800)
Subject: #16886: merge with 3.2
X-Git-Tag: v3.3.1rc1~346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb3bd161cb4e63d10c3e75d1aadb2246b1024ab7;p=python

#16886: merge with 3.2
---

fb3bd161cb4e63d10c3e75d1aadb2246b1024ab7