From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 18:06:07 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.2.4rc1~391
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=275c848736f1c15efc15b84ced315218ac639899;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

275c848736f1c15efc15b84ced315218ac639899