]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEric V. Smith <eric@trueblade.com>
Mon, 12 Mar 2012 22:18:30 +0000 (15:18 -0700)
committerEric V. Smith <eric@trueblade.com>
Mon, 12 Mar 2012 22:18:30 +0000 (15:18 -0700)

Trivial merge