From: Trent Nelson <trent@trent.me>
Date: Wed, 17 Oct 2012 22:05:27 +0000 (-0400)
Subject: Merge issue #15298.
X-Git-Tag: v3.4.0a1~2231
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c78649873fe76da34230bb8ee5284ff64b2af2e4;p=thirdparty%2FPython%2Fcpython.git

Merge issue #15298.
---

c78649873fe76da34230bb8ee5284ff64b2af2e4