From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 1 Jan 2013 03:40:42 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~291
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f7df8f2070391f28391e3594580c07e11b6b32b;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

1f7df8f2070391f28391e3594580c07e11b6b32b