]> granicus.if.org Git - python/commitdiff
merge 3.2
authorNed Deily <nad@acm.org>
Sun, 1 Jan 2012 09:10:35 +0000 (01:10 -0800)
committerNed Deily <nad@acm.org>
Sun, 1 Jan 2012 09:10:35 +0000 (01:10 -0800)

Trivial merge