Ummm, maybe a unicorn, too?
I predict this release will easily be seen to be all about re-establishing the iPhone as having the equal or better feature in oh-so-many ways to the Androids. And putting a lot of hardware goodies onto the iPod Touch, for which I have yet to see any decent Android competition (i.e., NOT the Archos), would be losing focus from what's shaping up to be a fight as fraught as their 1990's near-fatal mangling by Microsoft.
So, faster, shinier iPhone hardware with better battery life? Proof in hand. More data flexibility, as perhaps in Verizon? Prospects look good. Customizations and multitasking that are key features for Android fans? Announced and/or demo'd. Aggressive pricing, à la iPads'? More likely than not. Extra features regards Mobile Me, the Cloud, apps, ? Whatever they can pull out of their hats.
That's a pretty long list of goodies for one year, and all of it is focused on message: You'll see why 2010 will not be like 1995.
Oh, and the version control? Here's a guess: The iPad team had to take the status quo of the iPhone software and work in secret while tuning it to the unannounced device. They would've worked in isolation from the iPhone team. Now, I'll guess there's some maintenance/cleanup on iPad but the big push is to get the now-announced iPhone OS 4.0 working as well as we all want: more features, faster, bugless, ready to use AND LATER tweak for the iPad. Only once that feverish and again, very-tightly-focused development goes out the door do the engineers take a weekend off and go back to merging all the 4.0 goodness with the iPad specifics.
