Windows 2008 R2 on track after all

EDIT: Updated at 08/19/08 18:38 PDT to reflect clarification from Microsoft regarding the name of the next major version of windows Server.
So it turns out what I posted this morning was a bunch of hoo-ha (as if you didn't know that already)… Mary Jo now reports that her initial information, on which I based my post this morning (not having nearly the sources MJ does inside the company… which is why I read her blog religiously), was incorrect: Windows 2008 Revision 2 is still on track for 2010, to be followed two years later by the as yet un-named major version release scheduled according to the roadmap.
Everything I said about naming schemes and confusion in the first post stands, of course; it just happens that R2 is still on the way instead of having been rebranded "Windows 7 Server."