From: David Malcolm <dmalcolm@redhat.com>
Date: Mon, 6 May 2013 18:51:13 +0000 (-0400)
Subject: #17833: merge with 3.3
X-Git-Tag: v3.4.0a1~784
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1df37c657d7b32cfc7e765f13323415ef1c5be31;p=python

#17833: merge with 3.3
---

1df37c657d7b32cfc7e765f13323415ef1c5be31