Facebook, Yahoo Kiss and Make Up

Yahoo and Facebook, partners before patent litigation soured relations this spring, are back to being partners again.

The two Internet companies announced a settlement of their legal battle July 6, drawing an end to a nasty but ultimately short-lived dispute that had roiled Silicon Valley. No money changed hands as part of the deal. Instead the companies announced what they called a strategic alliance, which includes a new advertising partnership, expanded distribution arrangements and a patent cross-license. Yahoo and Facebook said they will also work together to bring Yahoo's media event coverage to Facebook users, by collaborating on "social integrations" on the Yahoo site.