Index: modules/dashboard/dashboard.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dashboard/dashboard.module,v
retrieving revision 1.39
diff -u -p -r1.39 dashboard.module
--- modules/dashboard/dashboard.module	3 Oct 2010 00:14:57 -0000	1.39
+++ modules/dashboard/dashboard.module	4 Oct 2010 02:56:43 -0000
@@ -42,6 +42,7 @@ function dashboard_menu() {
     'description' => 'View and customize your dashboard.',
     'page callback' => 'dashboard_admin',
     'access arguments' => array('access dashboard'),
+    '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 convenient "home link".
     'weight' => -15,
Index: modules/help/help.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.module,v
retrieving revision 1.98
diff -u -p -r1.98 help.module
--- modules/help/help.module	1 Oct 2010 15:24:18 -0000	1.98
+++ modules/help/help.module	4 Oct 2010 02:56:43 -0000
@@ -15,6 +15,7 @@ function help_menu() {
     'description' => 'Reference for usage, configuration, and modules',
     'page callback' => 'help_main',
     'access arguments' => array('access administration pages'),
+    'menu_name' => 'management',
     'weight' => 9,
     'file' => 'help.admin.inc',
   );
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1304
diff -u -p -r1.1304 node.module
--- modules/node/node.module	3 Oct 2010 01:15:33 -0000	1.1304
+++ modules/node/node.module	4 Oct 2010 02:56:44 -0000
@@ -1802,6 +1802,7 @@ function node_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('node_admin_content'),
     'access arguments' => array('access content overview'),
+    'menu_name' => 'management',
     'weight' => -10,
     'file' => 'node.admin.inc',
   );
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.969
diff -u -p -r1.969 system.module
--- modules/system/system.module	1 Oct 2010 18:37:23 -0000	1.969
+++ modules/system/system.module	4 Oct 2010 02:56:44 -0000
@@ -530,7 +530,6 @@ function system_menu() {
     'access arguments' => array('access administration pages'),
     'page callback' => 'system_admin_menu_block_page',
     'weight' => 9,
-    'menu_name' => 'management',
     'theme callback' => 'variable_get',
     'theme arguments' => array('admin_theme'),
     'file' => 'system.admin.inc',
@@ -560,6 +559,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',
@@ -572,6 +572,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',
@@ -639,6 +640,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,
   );
@@ -672,6 +674,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',
   );
 
@@ -1007,6 +1010,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.45
diff -u -p -r1.45 toolbar.module
--- modules/toolbar/toolbar.module	20 Sep 2010 02:43:18 -0000	1.45
+++ modules/toolbar/toolbar.module	4 Oct 2010 02:56:44 -0000
@@ -277,17 +277,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 = :menu_name AND module = :module AND link_path = :path', array(':menu_name' => 'management', ':module' => 'system', ':path' => 'admin'))->fetchAssoc();
-  if ($admin_link) {
-    $tree = menu_build_tree('management', array(
-      'expanded' => array($admin_link['mlid']),
-      'min_depth' => $admin_link['depth'] + 1,
-      'max_depth' => $admin_link['depth'] + 1,
-    ));
-  }
-
-  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.1205
diff -u -p -r1.1205 user.module
--- modules/user/user.module	3 Oct 2010 01:15:34 -0000	1.1205
+++ modules/user/user.module	4 Oct 2010 02:56:45 -0000
@@ -1578,6 +1578,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',