Upgrade to the iPhone 4s or Wait for the iPhone 5?

Consider this :
iPhone

released

June 29, 2007
iPhone 3G

released July 11, 2008
iPhone 3GS

released June 19, 2009
iPhone 4

released June 24, 2010
iPhone 4S released October 4, 2011

Seems to me like an iPhone 5 release around Summertime 2012.
If I’m eligible for the upgrade price from AT&T, I’m probably gonna upgrade to the 4S.  The new camera seems great.  Who bout you?