From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 9 Aug 2012 00:22:57 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0b2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=652e758fc41c953c5235f389e7dbb481bc915f0a;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

652e758fc41c953c5235f389e7dbb481bc915f0a