From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 12 Oct 2012 16:05:01 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~803
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b548d49f655311835b72e0a27e51d5b73e671c82;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

b548d49f655311835b72e0a27e51d5b73e671c82