On December 14, 2006, Microsoft released Visual Studio Service Pack 1 to the public. I installed it last week when I rebuilt my workstation, but forgot to let everyone know that it was it. It has WAP built in and it requires you to remove any previous versions of WAP from your system prior to installation.
Enjoy...