iPhone to iPhone 3G Data Swap

So I finally broke down and bought the 3G. Problem is I can't figure out how to bring over the settings on my old iPhone. There was a prompt at set-up that gave me the option of bringing my old setting over, but that got kaboshed when my old phone had a newer OS than the 3G came with (2.1). So, I upgraded the new phone to 2.1 but I can't find an easy way to grab my old setting and apply them to my new phone. Any suggestions?