Restoring a single partition

[washer]

I have my drive in 3 partitions. One for Mac OS 10.5, one is 12 GB for Linux and the third is a small chunk for a Linux swap.

I am trying to install Windows 7 to replace Linux. I plan on deleting the linux partitions and making my whole drive just one single mac partition again. Then I plan on using the Bootcamp Assistant to install Windows 7.

I was able to remove the Linux partition but when I try to remove the swap, the dialogue says:

Removing this volume will permanently erase the data from the volume.

This volume will be erased:
“Linux Swap”

These volumes will NOT be erased:
“Macintosh HD”
“Linux Swap”

No other changes to your disk will be made.

So when I remove the Linux Swap, there is still a Linux Swap remaining of the same size. When I try to repartition the drive to expand the Macintosh HD to fill up the whole drive (the empty space from the old Linux partition, since I still cannot remove the swap) Disk Utility give me the error

Partition failed with the error:

MediaKit reports no such partition.

Do I have to use the Disk Utility on my install disk? I have been trying from my drive because I don't have the disk on me.

Thanks a ton