Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.331
diff -u -p -r1.331 menu.inc
--- includes/menu.inc	30 Jul 2009 10:16:48 -0000	1.331
+++ includes/menu.inc	31 Jul 2009 03:57:02 -0000
@@ -1956,8 +1956,11 @@ function _menu_navigation_links_rebuild(
         if (empty($item['menu_name']) || ($item['menu_name'] == $existing_item['menu_name'])) {
           $item['menu_name'] = $existing_item['menu_name'];
           $item['plid'] = $existing_item['plid'];
+          if (!isset($item['plid'])) {
+            $item['plid'] = $existing_item['plid'];
+          }
         }
-        else {
+        elseif (!isset($item['plid'])) {
           // If it moved, put it at the top level in the new menu.
           $item['plid'] = 0;
         }
Index: modules/help/help.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.module,v
retrieving revision 1.85
diff -u -p -r1.85 help.module
--- modules/help/help.module	20 Jul 2009 18:51:33 -0000	1.85
+++ modules/help/help.module	31 Jul 2009 03:57:03 -0000
@@ -15,6 +15,8 @@ function help_menu() {
     'page callback' => 'help_main',
     'access arguments' => array('access administration pages'),
     'weight' => 9,
+    'menu_name' => 'management',
+    'plid' => 0,
   );
 
   foreach (module_implements('help', TRUE) as $module) {
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1089
diff -u -p -r1.1089 node.module
--- modules/node/node.module	30 Jul 2009 19:24:21 -0000	1.1089
+++ modules/node/node.module	31 Jul 2009 03:57:09 -0000
@@ -1662,6 +1662,8 @@ function node_menu() {
     'page arguments' => array('node_admin_content'),
     'access arguments' => array('administer nodes'),
     'weight' => -10,
+    'menu_name' => 'management',
+    'plid' => 0,
   );
   $items['admin/content/node'] = array(
     'title' => 'Content',
@@ -1708,7 +1710,6 @@ function node_menu() {
     'page callback' => 'node_add_page',
     'access callback' => '_node_add_access',
     'weight' => 1,
-    'menu_name' => 'management',
   );
   $items['rss.xml'] = array(
     'title' => 'RSS feed',
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.731
diff -u -p -r1.731 system.module
--- modules/system/system.module	30 Jul 2009 19:57:10 -0000	1.731
+++ modules/system/system.module	31 Jul 2009 03:57:18 -0000
@@ -493,7 +493,7 @@ function system_menu() {
     'type' => MENU_CALLBACK,
   );
   $items['admin'] = array(
-    'title' => 'Administer',
+    'title' => 'Configuration and modules',
     'access arguments' => array('access administration pages'),
     'page callback' => 'system_main_admin_page',
     'weight' => 9,
@@ -537,14 +537,19 @@ function system_menu() {
     'page callback' => 'system_admin_menu_block_page',
     'access callback' => 'system_admin_menu_block_access',
     'access arguments' => array('admin/structure', 'access administration pages'),
+    'menu_name' => 'management',
+    'plid' => 0,
   );
   // Themes.
   $items['admin/structure/themes'] = array(
-    'title' => 'Themes',
+    'title' => 'Appearance',
     'description' => 'Change which theme your site uses or allows users to set.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('system_themes_form'),
     'access arguments' => array('administer site configuration'),
+    'menu_name' => 'management',
+    'plid' => 0,
+    'weight' => 1,
   );
   $items['admin/structure/themes/select'] = array(
     'title' => 'List',
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.4
diff -u -p -r1.4 toolbar.module
--- modules/toolbar/toolbar.module	28 Jul 2009 10:35:56 -0000	1.4
+++ modules/toolbar/toolbar.module	31 Jul 2009 03:57:18 -0000
@@ -112,14 +112,6 @@ function toolbar_build() {
  */
 function toolbar_get_menu_tree() {
   $tree = menu_tree_all_data('management');
-  foreach ($tree as $item) {
-    if ($item['link']['link_path'] == 'admin' && !empty($item['below'])) {
-      // Only take items right below the 'admin' path. All other management 
-      // items are discarded.
-      $tree = $item['below'];
-      break;
-    }
-  }
   foreach ($tree as $key => $item) {
     // Get rid of subitems to have a leaner data structure.
     unset($tree[$key]['below']);
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1014
diff -u -p -r1.1014 user.module
--- modules/user/user.module	28 Jul 2009 19:32:33 -0000	1.1014
+++ modules/user/user.module	31 Jul 2009 03:57:25 -0000
@@ -1323,11 +1323,13 @@ function user_menu() {
     'access arguments' => array('admin/user', 'access administration pages'),
   );
   $items['admin/user/user'] = array(
-    'title' => 'Users',
+    'title' => 'People',
     'description' => 'List, add, and edit users.',
     'page callback' => 'user_admin',
     'page arguments' => array('list'),
     'access arguments' => array('administer users'),
+    'menu_name' => 'management',
+    'plid' => 0,
   );
   $items['admin/user/user/list'] = array(
     'title' => 'List',