]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#6570: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 13 Dec 2011 13:53:47 +0000 (15:53 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 13 Dec 2011 13:53:47 +0000 (15:53 +0200)

Trivial merge