Just thinking out loud here:
Can Jobs really talk about just the iPhone 4 for an hour? I mean we know the basics of iPhone OS 4.0, from the rumors we know there isn't a whole lot "new" in the iPhone 4, just big improvements and new form factor. ATT has already announced availability of tethering.
My gut is telling me this is going to be more than an iPhoneFest. 30 min for iPhone, 30 min for something else. Maybe new cloud service, iPhone OS based Apple TV, but something else.
One other thought -- maybe the reason ATT is discontinuing the unlimited 3G service on the iPad and iPhone is because of a new cloud service that presumably will chew up a lot of bandwidth. Maybe ATT is blaming "2%" of users now but the real reason is they know that 2% is going to grow to 10, 20, 30% very quickly because of this new service.