[jasonistaken]

There was a large commit to trunk a few days ago that upgraded most of the cookie stuff.