Nope, CS3 is still separated out. We can hope for CS4, but Adobe tends to be a bit lame on the licensing front, so I highly, highly doubt that you'll be able to do the "one desktop, one laptop" license that Microsoft Office & Quark's XPress have adopted, and you won't be able to buy the same license to work on either a Mac or a PC.