From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 17 Mar 2014 15:23:07 +0000 (-0400)
Subject: Merge fix for #20960
X-Git-Tag: v3.5.0a1~2108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c833f7ea0fcf3c566762c76683d8be0b7db60aeb;p=python

Merge fix for #20960
---

c833f7ea0fcf3c566762c76683d8be0b7db60aeb