I figured I'd throw out to the masses the steps to do the workaround.  It's relatively easy, all you need is your product key.  Below are the steps:

1. From the Operations page in Central Administration, locate the Upgrade and Migration section (bottom of the page) and click Convert license type.

2. On the Convert License page you'll be able to enter your existing Product Key in the text field.  Note the Current License field and how it says Office SharePoint Server Trial...(my dev environment also has the Enterprise Edition CALs).  Enter your Product Key here and click OK.

3. After clicking OK you'll see the familiar Operation in Progress screen.

4. If all goes well, you should see the Success! page

5. When you head on back to the Convert License page you should now see the license type without the Trial words in it

- M