Simply run the setup program. If you specify the same directories, the install program will overwrite the older versions.

Check through the server properties to make sure all your settings are still correct. Due to the many combiniations of upgrade paths, some settings may contain garbage. All of your older settings should still be there.

You have successfully upgraded.