From: Eric V. Smith <eric@trueblade.com>
Date: Mon, 12 Mar 2012 22:18:30 +0000 (-0700)
Subject: Merge heads.
X-Git-Tag: v3.3.0a2~232^2~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d4798cb93aabdea7843c85d60b0e898107bae05;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

1d4798cb93aabdea7843c85d60b0e898107bae05