Merging Hard drive partitions

Six months ago when I installed Windows 7 on laptop I thought I was being
very clever having my separate os and partitions on my system. I mapped
/users/mark to the separate partition and thought it would all be good. Now
I' having my regrets. I did it so I could backup the system separately from
the data and have no worries if I ever had to do a complete restore. Instead
a myriad of programs are having problems and I assume it's only this setup
that causes the problem. Examples: many Adobe Air programs fail to run
properly (tweetdeck, spaz, etc) and other programs are crippled (Chrome
browser crashes when installing extensions). I give up. Since I get little
advantage and much hassle I'm prepared to merge the two partitions and see
these problems off. Imagine my surprise when I went to find Partition Magic
and it's gone. What do you use to merge partitions without losing data? I
really don't want to spend the rest of the day copying ~400 GB of data back
and forth my network.

Cheers
Mark

   *Mark Levison* | Agile Pain Relief
Consulting<http://agilepainrelief.com/>| Agile
Editor @ InfoQ <http://www.infoq.com/about.jsp>
Blog <http://www.notesfromatooluser.com/> |
Twitter<http://twitter.com/mlevison>| Office: (613) 862-2538
Recent Entries: Self Inflicted Agile
Injuries<http://www.notesfromatooluser.com/2009/12/self-inflicted-agile-injuries.html>,
Why use an Agile
Coach<http://www.notesfromatooluser.com/2009/11/why-use-an-agile-coach.html>