From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 27 Jan 2012 14:14:29 +0000 (-0500)
Subject: merge heads (#13887)
X-Git-Tag: v3.3.0a1~292
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc9f1b5a146a599bde8245ad80edadedecb8ae25;p=thirdparty%2FPython%2Fcpython.git

merge heads (#13887)
---

bc9f1b5a146a599bde8245ad80edadedecb8ae25