I have a Windows Live account that my Xbox Live and Zune account are connected to.

But I don't use the email address I sign in with, it's some Hotmail account.

How do I switch these over to the Windows account I just made that's connected to the Yahoo address I use for everything?