Index: includes/menu.inc
===================================================================
RCS file: /Users/Shared/code/drupal/includes/menu.inc,v
retrieving revision 1.275
diff -u -p -r1.275 menu.inc
--- includes/menu.inc	12 Jun 2008 20:49:39 -0000	1.275
+++ includes/menu.inc	22 Jun 2008 21:40:42 -0000
@@ -1574,10 +1574,10 @@ function menu_set_active_trail($new_trai
         $curr = FALSE;
       }
       else {
-        // Move to the child link if it's in the active trail.
-        if ($curr['below'] && $curr['link']['in_active_trail']) {
+        // Add the link if it's in the active trail, then move to the link below.
+        if ($curr['link']['in_active_trail']) {
           $trail[] = $curr['link'];
-          $tree = $curr['below'];
+          $tree = $curr['below'] ? $curr['below'] : array();
         }
         list($key, $curr) = each($tree);
       }