It seems almost certain that it's just the iPhone 2,1 - obviously it's not the iProd or ChinaBrick referred to in the 3.0 beta firmware. So does this mean that iPhone 3,1 is right around the corner? I've got a 32GB 3GS reserved (my first iPhone!) but don't want to find out that an iPhone Pro is coming out in a few months or something.