5D Mark II to Remain in Lineup, Completely New Model Instead?

A tipster recently sent me word that the Canon 5D Mark II would remain in Canon’s lineup in the near future.  However, another new DSLR model would be released soon (instead of a 5D Mark III) and would be a step-up from the 5D Mark II.
Could this be the mystery Canon camera that appeared in Kenya a couple weeks ago?
Recent spec leaks have suggested a more impressive AF and video capabilities that Canon may not be willing to part with for a sub-$3000 price point that the 5D-line has settled into.
Of course, if Nikon really delivers the D800 with the specs we think it will have, Canon may find itself between a rock and hard place.  That, and the fact that the Canon 5D Mark II is a 3.5-year-old camera that’s ripe for replacement.
Hopefully, we’ll know something before NAB 2012 though.
Any thoughts on the matter or additional tips to provide? Feel free to drop a comment below or shoot me a note via the contact form.