I recommend doing a fresh install of Win7 rather that messing with cloning & then upgrading.

EDIT: If you have the Win7 Upgrade disc, it can still be used to do a clean install, you just need to install it twice. The 2nd install "upgrades" the 1st. I believe it's the same as the following Vista "workaround":

The information on Computing.Net is the opinions of its users. Such
opinions may not be accurate and they are to be used at your own risk.
Computing.Net cannot verify the validity of the statements made on this
site. Computing.Net and Compnet Ventures, LLC hereby disclaim all responsibility
and liability for the content of Computing.Net and its accuracy.