Yahoo and Facebook settled

Seems that Yahoo and Facebook finally agreed on some new terms based on ad deals.