Facebook and Zynga Make Up, Sign Five-Year Agreement for Social Time-Wasting

We reported a couple weeks ago that Facebook was in a "standoff" with Zynga, its most popular developer and maker of immensely popular (and immensely feed-clogging) games like Farmville and Mafia Wars. The battle was over Facebook's decision to turn all in-app currency into Facebook's own credit system--and more importantly, the little detail that Facebook would snatch 30% of all the money spent on Facebook apps.

Looks like the two came to some kind of agreement, though in an official...