Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.509
diff -u -p -r1.509 book.module
--- modules/book/book.module	24 Aug 2009 01:49:41 -0000	1.509
+++ modules/book/book.module	25 Aug 2009 11:42:26 -0000
@@ -102,6 +102,7 @@ function book_node_view_link($node, $bui
 function book_menu() {
   $items['admin/content/book'] = array(
     'title' => 'Books',
+    'description' => "Manage your site's book outlines.",
     'page callback' => 'book_admin_overview',
     'access arguments' => array('administer book outlines'),
     'type' => MENU_LOCAL_TASK,
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1111
diff -u -p -r1.1111 node.module
--- modules/node/node.module	25 Aug 2009 02:48:16 -0000	1.1111
+++ modules/node/node.module	25 Aug 2009 11:42:26 -0000
@@ -1698,7 +1698,7 @@ function _node_add_access() {
 function node_menu() {
   $items['admin/content'] = array(
     'title' => 'Content',
-    'description' => 'Find and manage content and comments.',
+    'description' => 'Find and manage content.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('node_admin_content'),
     'access arguments' => array('administer nodes'),
@@ -1707,6 +1707,7 @@ function node_menu() {
   );
   $items['admin/content/node'] = array(
     'title' => 'Content',
+    'description' => "View, edit, and delete your site's content.",
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.771
diff -u -p -r1.771 system.module
--- modules/system/system.module	25 Aug 2009 10:07:19 -0000	1.771
+++ modules/system/system.module	25 Aug 2009 11:42:26 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: system.module,v 1.771 2009/08/25 10:07:19 dries Exp $
+// $Id: system.module,v 1.769 2009/08/24 22:03:01 webchick Exp $
 
 /**
  * @file
@@ -590,6 +590,7 @@ function system_menu() {
   );
   $items['admin/appearance/settings'] = array(
     'title' => 'Configure',
+    'description' => 'Configure default and theme specific settings.',
     'page arguments' => array('system_theme_settings'),
     'access arguments' => array('administer site configuration'),
     'type' => MENU_LOCAL_TASK,
@@ -1680,12 +1681,26 @@ function system_admin_menu_block($item) 
   }
 
   $content = array();
+  $default_task = NULL;
+  $has_subitems = FALSE;
   $result = db_query("
-    SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, m.description, ml.*
-    FROM {menu_links} ml
-    LEFT JOIN {menu_router} m ON ml.router_path = m.path
-    WHERE ml.plid = :plid AND ml.menu_name = :name AND hidden = 0", array(':plid' => $item['mlid'], ':name' => $item['menu_name']), array('fetch' => PDO::FETCH_ASSOC));
+    SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, m.description, m.path, m.weight as router_weight, ml.*
+    FROM {menu_router} m 
+    LEFT JOIN {menu_links} ml ON m.path = ml.router_path
+    WHERE (ml.plid = :plid AND ml.menu_name = :name AND hidden = 0) OR (m.tab_parent = :path AND m.type IN (:local_task, :default_task))", array(':plid' => $item['mlid'], ':name' => $item['menu_name'], ':path' => $item['path'], ':local_task' => MENU_LOCAL_TASK, ':default_task' => MENU_DEFAULT_LOCAL_TASK), array('fetch' => PDO::FETCH_ASSOC));
   foreach ($result as $link) {
+    if (!isset($link['link_path'])) {
+      // If this was not an actual link, fake the tab as a menu link, so we
+      // don't need to special case it beyond this point.
+      $link['link_title'] = $link['title'];
+      $link['link_path'] = $link['path'];
+      $link['options'] = 'a:0:{}';
+      $link['weight'] = $link['router_weight'];
+    }
+    else {
+      // We found a non-tab subitem, remember that.
+      $has_subitems = TRUE;
+    }
     _menu_link_translate($link);
     if (!$link['access']) {
       continue;
@@ -1697,7 +1712,16 @@ function system_admin_menu_block($item) 
     }
     // Prepare for sorting as in function _menu_tree_check_access().
     // The weight is offset so it is always positive, with a uniform 5-digits.
-    $content[(50000 + $link['weight']) . ' ' . drupal_strtolower($link['title']) . ' ' . $link['mlid']] = $link;
+    $key = (50000 + $link['weight']) . ' ' . drupal_strtolower($link['title']) . ' ' . $link['mlid'];
+    $content[$key] = $link;
+    if ($link['type'] == MENU_DEFAULT_LOCAL_TASK) {
+      $default_task = $key;
+    }
+  }
+  if ($has_subitems) {
+    // If we've had at least one non-tab subitem, remove the link for the 
+    // default task, since that is already broken down to subitems.
+    unset($content[$default_task]);
   }
   ksort($content);
   $cache[$item['mlid']] = $content;
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1030
diff -u -p -r1.1030 user.module
--- modules/user/user.module	24 Aug 2009 00:14:23 -0000	1.1030
+++ modules/user/user.module	25 Aug 2009 11:42:26 -0000
@@ -1361,11 +1361,6 @@ function user_menu() {
     'weight' => -4,
     'file' => 'user.admin.inc',
   );
-  $items['admin/people/list'] = array(
-    'title' => 'List',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-    'weight' => -10,
-  );
   $items['admin/people/create'] = array(
     'title' => 'Add user',
     'page arguments' => array('create'),