]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 23 May 2011 22:03:33 +0000 (01:03 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 23 May 2011 22:03:33 +0000 (01:03 +0300)

Trivial merge