]> granicus.if.org Git - python/commitdiff
#11446: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 11 Mar 2011 18:56:58 +0000 (20:56 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 11 Mar 2011 18:56:58 +0000 (20:56 +0200)

Trivial merge