]> granicus.if.org Git - python/commitdiff
merge from 3.2 - heads
authorEli Bendersky <eliben@gmail.com>
Sat, 30 Jul 2011 08:37:06 +0000 (11:37 +0300)
committerEli Bendersky <eliben@gmail.com>
Sat, 30 Jul 2011 08:37:06 +0000 (11:37 +0300)

Trivial merge