adding classes to a menu

I am using the new wordpress menu system.

I want to write a plugin that adds additional classes to the returned menu. I am trying to find the right filter hooks.

The two that look most likely are wp_nav_menu or ‘add_menu_classes’. I want to add the classes right before they are returned to the user (on the normal page, nothing need be changed on the admin screen).