Thanks for the reassurance, but it's been over a day, and the client doesn't seem to be doing anything. What is -rescan?
Is the option that tells bitcoin to search again for whatever coins may exist on the blockchain for it's addresses. Is not needed in newer versions of Bitcoin-qt so you can ignore it if you have +0.6.