Index: modules/dashboard/dashboard.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dashboard/dashboard.module,v
retrieving revision 1.26
diff -u -p -r1.26 dashboard.module
--- modules/dashboard/dashboard.module	13 Apr 2010 15:23:02 -0000	1.26
+++ modules/dashboard/dashboard.module	21 Apr 2010 22:38:55 -0000
@@ -30,6 +30,7 @@ function dashboard_menu() {
     'description' => 'View and customize your dashboard',
     'page callback' => 'dashboard_admin',
     'access arguments' => array('access administration pages'),
+    'menu_name' => 'management',
     // Make this appear first, so for example, in admin menus, it shows up on
     // the top corner of the window as a convinient "home link".
     'weight' => -100,
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.921
diff -u -p -r1.921 system.module
--- modules/system/system.module	13 Apr 2010 15:23:03 -0000	1.921
+++ modules/system/system.module	21 Apr 2010 22:38:55 -0000
@@ -520,7 +520,6 @@ function system_menu() {
     'access arguments' => array('access administration pages'),
     'page callback' => 'system_main_admin_page',
     'weight' => 9,
-    'menu_name' => 'management',
     'theme callback' => 'variable_get',
     'theme arguments' => array('admin_theme'),
     'file' => 'system.admin.inc',
@@ -552,6 +551,7 @@ function system_menu() {
   $items['admin/structure'] = array(
     'title' => 'Structure',
     'description' => 'Administer blocks, content types, menus, etc.',
+    'menu_name' => 'management',
     'position' => 'right',
     'weight' => -8,
     'page callback' => 'system_admin_menu_block_page',
@@ -564,6 +564,7 @@ function system_menu() {
     'description' => 'Select and configure your themes',
     'page callback' => 'system_themes_page',
     'access arguments' => array('administer themes'),
+    'menu_name' => 'management',
     'position' => 'left',
     'weight' => -6,
     'file' => 'system.admin.inc',
@@ -631,6 +632,7 @@ function system_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('system_modules'),
     'access arguments' => array('administer modules'),
+    'menu_name' => 'management',
     'file' => 'system.admin.inc',
     'weight' => -2,
   );
@@ -664,6 +666,7 @@ function system_menu() {
     'description' => 'Administer settings',
     'page callback' => 'system_admin_config_page',
     'access arguments' => array('access administration pages'),
+    'menu_name' => 'management',
     'file' => 'system.admin.inc',
   );
 
@@ -996,6 +999,7 @@ function system_menu() {
     'page callback' => 'system_admin_menu_block_page',
     'access arguments' => array('access site reports'),
     'weight' => 5,
+    'menu_name' => 'management',
     'position' => 'left',
     'file' => 'system.admin.inc',
   );
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.36
diff -u -p -r1.36 toolbar.module
--- modules/toolbar/toolbar.module	4 Apr 2010 17:11:20 -0000	1.36
+++ modules/toolbar/toolbar.module	21 Apr 2010 22:46:13 -0000
@@ -265,18 +265,7 @@ function toolbar_view() {
  * Get only the top level items below the 'admin' path.
  */
 function toolbar_get_menu_tree() {
-  $tree = array();
-  $admin_link = db_query("SELECT * FROM {menu_links} WHERE menu_name = 'management' AND module = 'system' AND link_path = 'admin'")->fetchAssoc();
-  if ($admin_link) {
-    // @todo Use a function like book_menu_subtree_data().
-    $tree = menu_tree_all_data('management', $admin_link, $admin_link['depth'] + 1);
-    // The tree will be a sub-tree with the admin link as a single root item.
-    // @todo It is wrong to assume it's the last.
-    $admin_link = array_pop($tree);
-    $tree = $admin_link['below'] ? $admin_link['below'] : array();
-  }
-
-  return $tree;
+  return menu_tree_all_data('management', NULL, 1);
 }
 
 /**
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1160
diff -u -p -r1.1160 user.module
--- modules/user/user.module	20 Apr 2010 08:25:30 -0000	1.1160
+++ modules/user/user.module	21 Apr 2010 22:38:55 -0000
@@ -1488,6 +1488,7 @@ function user_menu() {
     'page callback' => 'user_admin',
     'page arguments' => array('list'),
     'access arguments' => array('administer users'),
+    'menu_name' => 'management',
     'position' => 'left',
     'weight' => -4,
     'file' => 'user.admin.inc',