The bizarre patent war between Yahoo and Facebook is now over, and it looks like the two business partners are coming off of it on a high note. According to All Things D, both Yahoo and Facebook have entered into a strategic alliance, dramatically expanding their content distribution and data partnership, as well as adding a deeper, better joint advertising deal. The deal also includes talks of cross-licensing patents, which is the ammunition that most companies use for patent litigation (see Apple). It seems that the whole patent war was instigated by former Yahoo CEO Scott Thompson, and as soon as he was taken out of the picture, Interim Yahoo CEO Ross Levinsohn and Facebook COO Sheryl Sandberg immediately started talks on how to end the whole nasty business. You can read the joint interview that All Things D did with both Levinsohn and Sandberg at the link below.