Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.14
diff -u -p -r1.14 toolbar.module
--- modules/toolbar/toolbar.module	17 Oct 2009 00:51:53 -0000	1.14
+++ modules/toolbar/toolbar.module	17 Oct 2009 10:55:17 -0000
@@ -85,7 +85,7 @@ function toolbar_build() {
     '#attributes' => array('id' => 'toolbar-menu'),
   );
 
-  // Add logout & user account links
+  // Add help, logout, & user account links
   $build['toolbar_user'] = array(
     '#theme' => 'links',
     '#links' => array(
@@ -98,6 +98,10 @@ function toolbar_build() {
         'title' => t('Log out'),
         'href' => 'user/logout',
       ),
+	  'help' => array(
+	    'title' => t('Help'),
+	    'href' => 'admin/help',
+	  ),
     ),
     '#attributes' => array('id' => 'toolbar-user'),
   );
@@ -118,6 +122,10 @@ function toolbar_get_menu_tree() {
     foreach ($tree as $key => $item) {
       // Get rid of subitems to have a leaner data structure.
       unset($tree[$key]['below']);
+      // Remove the help item: it is shown on the right of the toolbar instead.
+      if ($tree[$key]['link']['link_path'] == 'admin/help') {
+		unset($tree[$key]);
+	  }
     }
   }
   return $tree;