Index: admin_menu_toolbar/admin_menu_toolbar.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu_toolbar/admin_menu_toolbar.css,v
retrieving revision 1.5
diff -u -p -r1.5 admin_menu_toolbar.css
--- admin_menu_toolbar/admin_menu_toolbar.css	20 Feb 2010 02:17:55 -0000	1.5
+++ admin_menu_toolbar/admin_menu_toolbar.css	14 Mar 2010 19:11:27 -0000
@@ -112,6 +112,7 @@ body div#toolbar {
   background: transparent none;
   opacity: 1;
   width: auto;
+  clear: both;
 }
 #admin-menu li.admin-menu-shortcuts ul li a {
   border-radius: 5px;
Index: admin_menu_toolbar/admin_menu_toolbar.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu_toolbar/admin_menu_toolbar.module,v
retrieving revision 1.4
diff -u -p -r1.4 admin_menu_toolbar.module
--- admin_menu_toolbar/admin_menu_toolbar.module	19 Feb 2010 23:19:00 -0000	1.4
+++ admin_menu_toolbar/admin_menu_toolbar.module	14 Mar 2010 19:11:27 -0000
@@ -71,15 +71,27 @@ function admin_menu_toolbar_admin_menu_o
       'attributes' => array('class' => 'toggle'),
     ),
   );
-  // @todo *Move* this from $content['menu'] instead.
-  $content['shortcuts']['shortcuts']['node-add'] = array(
-    '#title' => t('Add content'),
-    '#href' => 'node/add',
-  );
-  $content['shortcuts']['shortcuts']['admin-content-node'] = array(
-    '#title' => t('Find content'),
-    '#href' => 'admin/content/node',
-    '#access' => user_access('administer nodes'),
-  );
-}
 
+  if (module_exists('shortcut')  ) {
+    $shortcut_set = shortcut_current_displayed_set();
+    foreach ($shortcut_set->links as $index => $link) {
+      $content['shortcuts']['shortcuts'][$link['link_path']] = array(
+        '#title' => $link['link_title'],
+        '#href' => $link['link_path'],
+        '#access' => TRUE,
+      );
+    }
+  }
+  else {
+    // @todo *Move* this from $content['menu'] instead.
+    $content['shortcuts']['shortcuts']['node-add'] = array(
+      '#title' => t('Add content'),
+      '#href' => 'node/add',
+    );
+    $content['shortcuts']['shortcuts']['admin-content-node'] = array(
+      '#title' => t('Find content'),
+      '#href' => 'admin/content/node',
+      '#access' => user_access('administer nodes'),
+    );
+  }
+}