Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.407
diff -u -p -r1.407 menu.inc
--- includes/menu.inc	23 Aug 2010 23:38:06 -0000	1.407
+++ includes/menu.inc	31 Aug 2010 19:04:35 -0000
@@ -1678,15 +1678,18 @@ function menu_navigation_links($menu_nam
   $links = array();
   foreach ($tree as $item) {
     if (!$item['link']['hidden']) {
-      $class = '';
+      $class = 'menu-' . $item['link']['mlid'];
       $l = $item['link']['localized_options'];
       $l['href'] = $item['link']['href'];
       $l['title'] = $item['link']['title'];
       if ($item['link']['in_active_trail']) {
-        $class = ' active-trail';
+        $l['attributes']['class'][] = 'active-trail';
+        $class .= ' active-trail';
       }
+      // Provide the original menu link for theme functions.
+      $l['link'] = $item['link'];
       // Keyed with the unique mlid to generate classes in theme_links().
-      $links['menu-' . $item['link']['mlid'] . $class] = $l;
+      $links[$class] = $l;
     }
   }
   return $links;