Tip - How to merge two Mac partitions?

Recently I ran Boot Camp Assistant to install a copy of Windows 7. The "Partitioning Disk" process froze and I force quit it - I know, bad idea - and although I was left with a functioning Mac, I n...