]> granicus.if.org Git - python/commitdiff
#11298: merge from 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 8 Mar 2011 14:49:57 +0000 (16:49 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 8 Mar 2011 14:49:57 +0000 (16:49 +0200)

Trivial merge