diff -u modules/contextual_links/contextual_links.info modules/contextual_links/contextual_links.info
--- modules/contextual_links/contextual_links.info
+++ modules/contextual_links/contextual_links.info	12 Nov 2009 04:35:22 -0000
@@ -1,6 +1,6 @@
 ; $Id$
 name = Contextual links
-description = Allows to use contextual links to perform actions related to elements on a page.
+description = Allows contextual links to be used to perform actions related to elements on a page.
 package = Core
 version = VERSION
 core = 7.x
diff -u modules/contextual_links/contextual_links.module modules/contextual_links/contextual_links.module
--- modules/contextual_links/contextual_links.module
+++ modules/contextual_links/contextual_links.module	12 Nov 2009 04:35:22 -0000
@@ -7,7 +7,7 @@
  */
 
 /**
- * Implements hook_permission().
+ * Implement hook_permission().
  */
 function contextual_links_permission() {
   return array(
@@ -19,7 +19,7 @@
 }
 
 /**
- * Implements hook_library().
+ * Implement hook_library().
  */
 function contextual_links_library() {
   $path = drupal_get_path('module', 'contextual_links');
@@ -132,7 +132,7 @@
       '#links' => $links,
       '#attributes' => array('class' => array('contextual-links')),
       '#attached' => array(
-        'library' => array(array('system', 'contextual-links')),
+        'library' => array(array('contextual_links', 'contextual-links')),
       ),
     );
   }
only in patch2:
unchanged:
--- modules/comment/comment.tpl.php	19 Oct 2009 20:33:21 -0000	1.16
+++ modules/comment/comment.tpl.php	12 Nov 2009 04:35:22 -0000
@@ -51,7 +51,7 @@
  */
 ?>
 <div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
-  <?php if ($contextual_links): ?>
+  <?php if (!empty($contextual_links)): ?>
     <?php print render($contextual_links); ?>
   <?php endif; ?>
 
only in patch2:
unchanged:
--- modules/menu/menu.api.php	17 Oct 2009 11:39:15 -0000	1.19
+++ modules/menu/menu.api.php	12 Nov 2009 04:35:22 -0000
@@ -536,7 +536,6 @@ function hook_menu_local_tasks_alter(&$d
  *
  * @see menu_contextual_links()
  * @see hook_menu()
- * @see system_preprocess()
  */
 function hook_menu_contextual_links_alter(&$links, $router_item, $root_path) {
   // Add a link to all contextual links for nodes.