From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Jan 2012 15:00:38 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v3.3.0a1~491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02ffa08990085cffacb7cbdcc6bcde767dac6256;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

02ffa08990085cffacb7cbdcc6bcde767dac6256