I've been wanting to buy an iPhone for a while, and I'm about ready to do so. It seems likely that the new one will be out in/around June. I'd really prefer not to wait 2 months, since my current phone is crap and really, really needs to die. So here's my question. In the past, with certain Apple products, people who bought them shortly before the release of a new version were allowed to upgrade free or for a reduced price (I think they did this with the 3G). Does anyone know the time frame on these deals (i.e. how long before the new product's release it could have been purchased and still be eligible)? Also, I read the rumors about the 32GB and smaller phones, would these be in addition to the current sizes, or replacing them? I don't really need a very big one, and my budget is a bit tight, so if the smaller is only going to be available in other countries (as suggested in the rumor), I may not be able to get it.