I think their whole '7 hours' thing is just to cover their back.
I'm pretty sure it's because they began using more stringent tests around the time they released their Macbook Airs. Consequently, their estimates have gone down but it is expected that their battery life will at least remain the same (hopefully this remains true for even the highest end quad core).
If I remember correctly, the new tests are called the Better Battery Test or something.