by running the Boot Camp Assistant, will put your drive back into one piece.
At least that is the way it is supposed to work. There have been some reports of it not working correctly.
P
I recently had the crazy idea of creating a partition of my MacBook's hard drive for Ubuntu, using the boot camp beta. After doing so, I realized that I only had an 80gb hard drive to begin with and, while I still have about 35gbs left, I would really like that space back. Is there any way to unpartition the hard drive?

Chowhound
Comic Vine
GameFAQs
GameSpot
Giant Bomb
TechRepublic