Well, I'm talking on the current 3GS.
I'm already assuming they'll be using a similar battery in the new iPhone to the one they've got in the iPad, which should result in at least a 2x increase in battery life, assuming power consumption remains the same.