Ubuntu Installation :: Cannot Boot Win7 After Installing 10.10

I had win 7 installed, decided to install ubuntu on this desktop computer. I had a windows partition, and a few other partitions, one with a wubi install of windows that I never used, so I decided to delete it, while installing ubuntu 10.10. I had free unallocated space for installing ubuntu, which was contiguous to the partition of the wubi install of ubuntu, so I decided to merge them, I did all this in gparted while installing ubuntu 10.10, 2gb swap, then 15gb root and all that remained to home.

Everything worked out fine (of course I never touched the win7 partition). After reboot grub doesn't show win 7, so I thought I'll just add it to grub, followed a few tutorials on this forum, but nothing worked. Then I remembered that the partition which I deleted to merge with the ubuntu partition, was an Active partition, and soon found out that my win7 partition was not active! (this is probably because I installed win 7 while I had still win vista, so that active partition was where vista was).

So now a ~100mb apparently unallocated partition was the active partition (win 7 hidden boot partition?), and trying the Startup repair of win 7 cd doesn't work, tried bootrec /fixboot, successfully, but bootrec /rebuildbcd can't find any Windows installation, even after setting the win7 partition as active with DiskPart. This is almost entirely a windows problem, but I just wanted to have Ubuntu working alongside Windows (I use a lot adobe's sw, which runs sadly only on windows, otherwise I would use only ubuntu).