not entirely expected...

[acroyear]

...given Katz's hatred of Disney (ever since Eisner fired him, though really that should be just a grudge with Eisner, and now a non-issue in the Iger era), but Dreamworks has signed with Disney to distribute their films for the next few years.

This is just a distribution deal, as Dreamworks is, like Pixar was years ago, an independent studio.  Shrek is not a Disney property and is unlikely to end up in a Disney park anytime soon.  The deal seems to be just for marketting and distribution, meaning Disney likely has approval rights for merchandise, but not exclusive control nor will they likely put current Dreamworks characters into the Disney stores.

However, it does open a door that had been closed between Disney and Spielberg over Roger Rabbit sequels...