]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sun, 29 Jan 2012 01:33:52 +0000 (20:33 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 29 Jan 2012 01:33:52 +0000 (20:33 -0500)

Trivial merge