From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 1 Jul 2013 18:10:39 +0000 (+0100)
Subject: Issue #17097: Merge.
X-Git-Tag: v3.4.0a1~346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=626032ac54ab2d6a779e10fdfd6eea06e43cbcc7;p=python

Issue #17097: Merge.
---

626032ac54ab2d6a779e10fdfd6eea06e43cbcc7