]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 14 Jan 2012 04:47:41 +0000 (23:47 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 14 Jan 2012 04:47:41 +0000 (23:47 -0500)

Trivial merge