Yeah, consensus is that it should be between now and WWDC. With how long it has been, I hope it is a significant revision and/or with significantly better pricing. Another thing is that we're likely going to have to wait for some time after we order our new systems to get them in (though hopefully not as bad as we saw with the 2.5).