I think he smart money is that iPhone will be the focus for now (launching June in the USA), and a new iPod with the iPhone features, except the phone but probably HDD based rather than flash, will launch at a later date (November for Xmas market, or Spring '08 if the iPhone push is to remain into peak).
Comments