From: Ned Deily <nad@acm.org>
Date: Tue, 11 Jun 2013 21:40:23 +0000 (-0700)
Subject: Issue #18187: merge from 3.3
X-Git-Tag: v3.4.0a1~530
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=982c6efeb55a59bebb43ef6ac1d8e969105e8dd1;p=thirdparty%2FPython%2Fcpython.git

Issue #18187: merge from 3.3
---

982c6efeb55a59bebb43ef6ac1d8e969105e8dd1