One version for regular users. The multiple versions mentioned during the keynote were a joke to make fun of the mess of versions of Vista that are out there. OS X is simple...you get everything for one low price.
Yeah, it was probably obvious to some and not to others. He did a really good job starting it off sounding so serious about it. It was probably one of the funniest moments I've witnessed in one of his keynotes.