Ok, so I am pretty slow. Ray Ozzie et al have been banging on for a while about Software + Services and I thought it meant office type software and web services so couldnt really see what all the big fuss was about. Duh, I just realised it means Web 2.0 services and Server Software. This gives me the following table:
Which makes a lot more sense. I guess thats one of the many reasons why I'm not running Microsoft!