From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 29 Sep 2012 17:47:47 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.4.0a1~2473
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9201214c2ce00ec5d516ce3023838a65c9fccdb5;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

9201214c2ce00ec5d516ce3023838a65c9fccdb5