Microsoft have just published information to their web site on what applications will be included in each of the Office 2007 bundles. They will now have an Enterprise and Professsional Plus bundle, along with their Professional, Small Business Edition, Standard, Home and Basic.
They have also released estimated retail prices for each of these editions. While the page lists the server products, no pricing is provided for them. However, it is interesting to note that there isn't a separate SPS + CMS edition. There is a separate server product for online forms - Microsoft Office Forms Server.