Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.328
diff -u -p -r1.328 menu.inc
--- includes/menu.inc	10 Jun 2009 21:52:36 -0000	1.328
+++ includes/menu.inc	4 Jul 2009 05:15:39 -0000
@@ -1956,9 +1956,11 @@ function _menu_navigation_links_rebuild(
         // A change in hook_menu may move the link to a different menu
         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/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1078
diff -u -p -r1.1078 node.module
--- modules/node/node.module	3 Jul 2009 10:57:46 -0000	1.1078
+++ modules/node/node.module	4 Jul 2009 05:15:40 -0000
@@ -1654,6 +1654,8 @@ function node_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('node_admin_content'),
     'access arguments' => array('administer nodes'),
+    'menu_name' => 'management',
+    'plid' => 0,
   );
   $items['admin/content/content/node'] = array(
     'title' => 'Content',
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.718
diff -u -p -r1.718 system.module
--- modules/system/system.module	1 Jul 2009 13:44:53 -0000	1.718
+++ modules/system/system.module	4 Jul 2009 05:15:40 -0000
@@ -477,7 +477,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,
@@ -530,6 +530,8 @@ function system_menu() {
     'page callback' => 'system_admin_menu_block_page',
     'access callback' => 'system_admin_menu_block_access',
     'access arguments' => array('admin/build', 'access administration pages'),
+    'menu_name' => 'management',
+    'plid' => 0,
   );
   // Themes.
   $items['admin/build/themes'] = array(
@@ -538,6 +540,8 @@ function system_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('system_themes_form'),
     'access arguments' => array('administer site configuration'),
+    'menu_name' => 'management',
+    'plid' => 0,
   );
   $items['admin/build/themes/select'] = array(
     'title' => 'List',
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1006
diff -u -p -r1.1006 user.module
--- modules/user/user.module	2 Jul 2009 15:07:37 -0000	1.1006
+++ modules/user/user.module	4 Jul 2009 05:15:40 -0000
@@ -1309,6 +1309,8 @@ function user_menu() {
     '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',