Newest Technology from Adobe Photoshop

Adobe CS5 offers a lot of new features and new tools such as 3D options. And now that Adobe has posted a preview or sneak peeks of this new technology making it as the future version of Adobe Photoshop, I want to know, did these make it into PhotoShop CS5? Are they the same and both having the same functionalities and features?
