From: Michael Foord <michael@voidspace.org.uk>
Date: Mon, 11 Feb 2013 00:28:02 +0000 (+0000)
Subject: Merge. Closes issue 17052.
X-Git-Tag: v3.4.0a1~1396
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e08f786f042f09454939a1a7a16ccea70488093;p=thirdparty%2FPython%2Fcpython.git

Merge. Closes issue 17052.
---

4e08f786f042f09454939a1a7a16ccea70488093