On the old XP-CD you can just boot it into fix mode and type "fixmbr" to fix that problem. Not sure how you do it with the windows 7 CD, but there's an "automatic repair" option that ought to work.
You can also fix it using your ubuntu live cd: http://ubuntuforums.org/showthread.php?t=622828