From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Oct 2012 13:52:02 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.4rc1~478^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba6a6cfbbc7359a871ef090f06ffeef1fb53e092;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

ba6a6cfbbc7359a871ef090f06ffeef1fb53e092