]> granicus.if.org Git - python/commitdiff
Merge to tip.
authorBrian Quinlan <brian@sweetapp.com>
Thu, 7 Apr 2011 22:30:41 +0000 (08:30 +1000)
committerBrian Quinlan <brian@sweetapp.com>
Thu, 7 Apr 2011 22:30:41 +0000 (08:30 +1000)

Trivial merge