From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 9 Dec 2012 06:22:17 +0000 (+1000)
Subject: Merge from 3.3 (issue #15209)
X-Git-Tag: v3.4.0a1~1886
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4b8f234d4407492c4493e3a16bc8263139c7869;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3 (issue #15209)
---

b4b8f234d4407492c4493e3a16bc8263139c7869