From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 8 Dec 2012 12:57:21 +0000 (+1000)
Subject: Merge from 3.3 (issue #16267)
X-Git-Tag: v3.4.0a1~1890
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c1034f41964140624e8579077c2aa328a440558;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3 (issue #16267)
---

0c1034f41964140624e8579077c2aa328a440558