Apple iPod Touch and iPhone 2.0

I still am unable to find out whether Apple is now shipping the iPod Touch with the new iPhone 2.0 software or not.

Are they expecting me to buy the iPod Touch and pay 10 USD more for the software update?

I guessed they would be selling the iPod Touch with the updated firmware now that the iPhone 3G is out…