Index: modules/shortcut/shortcut.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.module,v
retrieving revision 1.27
diff -u -p -r1.27 shortcut.module
--- modules/shortcut/shortcut.module	24 Sep 2010 00:37:44 -0000	1.27
+++ modules/shortcut/shortcut.module	20 Nov 2010 21:28:06 -0000
@@ -96,6 +96,7 @@ function shortcut_menu() {
   $items['admin/config/user-interface/shortcut/%shortcut_set/links'] = array(
     'title' => 'List links',
     'type' => MENU_DEFAULT_LOCAL_TASK,
+    'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
   );
   $items['admin/config/user-interface/shortcut/%shortcut_set/edit'] = array(
     'title' => 'Edit set name',
@@ -104,6 +105,7 @@ function shortcut_menu() {
     'access callback' => 'shortcut_set_edit_access',
     'access arguments' => array(4),
     'type' => MENU_LOCAL_TASK,
+    'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
     'file' => 'shortcut.admin.inc',
     'weight' => 10,
   );
@@ -203,6 +205,9 @@ function shortcut_block_view($delta = ''
     $shortcut_set = shortcut_current_displayed_set();
     $data['subject'] = t('@shortcut_set shortcuts', array('@shortcut_set' => $shortcut_set->title));
     $data['content'] = shortcut_renderable_links($shortcut_set);
+    if (!empty($data['content'])) {
+      $data['content']['#contextual_links']['shortcut'] = array('admin/config/user-interface/shortcut', array($shortcut_set->set_name));
+    }
     return $data;
   }
 }