Only 3G S.
Yes this is correct. Would it be possible for Apple to put that in the 3.0 update for all phones yes, but from a marketing stand point its more leverage for people to upgrade and spend the extra $.
I don't like it but I would do same thing. We are getting the complete 3.0 upgrade for free...