There may be a new iPhone in town soon. At least that seems to be what is going to happen if the code inside the latest firmware is correct.
According to MacRumors there is a mention of iPhone2,1 inside the latest firmware (2.2.1). This type of numbering follows Apple's traditional nomenclature for the iToy line. The first iPhone was iPhone1,1 the 3G is iPhone1,2 etc.
What this new numbering means is anyone's guess. But after yesterday's iPhone concept art it is certainly fun to speculate.