The Trial Licensing issue that was introduced by SharePoint SP2 has been resolved by the product team. If you are affected (or wish to avoid the problem) you can install the fix before or after you deploy SharePoint SP2. The details are available on the SharePoint Team Blog.