Does the iPhone 2.0 mean I'll be able to dump Entourage?

I'm pretty sure this is NOT the case, but will the software update in June mean I can use iCal and apple Mail rather than Entourage? Wouldn't it be great if in June, Jobs announced 1) the update, 2) new 3G phones, and 3) a Leopard update that added native exchange capability to iCal and apple mail???
Uh, I think I just answered my own question...