Fatal error: Cannot redeclare rcmail_mailbox_list()

[beatnik]

I followed the details in the update document, updating from RC1 to RC2 today. Immediately after I login, I get the following error message:

Fatal error: Cannot redeclare rcmail_mailbox_list() (previously declared in /home/mydomain/public_html/roundcubemail/include/main.inc:1733) in /home/mydomain/public_html/roundcubemail/program/steps/mail/func.inc on line 80

  Any ideas on what's going on? I didn't have issues with RC1, having upgraded from the beta2 release.

Thanks!