Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.341
diff -u -p -r1.341 blog.module
--- modules/blog/blog.module	8 Nov 2009 10:02:41 -0000	1.341
+++ modules/blog/blog.module	16 Nov 2009 21:36:21 -0000
@@ -77,7 +77,7 @@ function blog_node_view($node, $build_mo
         'attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => format_username($node)))),
       );
       $node->content['links']['blog'] = array(
-        '#theme' => 'links',
+        '#theme' => array('links__blog_node', 'links'),
         '#links' => $links,
         '#attributes' => array('class' => array('links', 'inline')),
       );
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.524
diff -u -p -r1.524 book.module
--- modules/book/book.module	8 Nov 2009 10:02:41 -0000	1.524
+++ modules/book/book.module	16 Nov 2009 21:36:33 -0000
@@ -89,7 +89,7 @@ function book_node_view_link($node, $bui
 
   if (!empty($links)) {
     $node->content['links']['book'] = array(
-      '#theme' => 'links',
+      '#theme' => array('links__book_node', 'links'),
       '#links' => $links,
       '#attributes' => array('class' => array('links', 'inline')),
     );
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.804
diff -u -p -r1.804 comment.module
--- modules/comment/comment.module	12 Nov 2009 06:46:44 -0000	1.804
+++ modules/comment/comment.module	16 Nov 2009 21:37:25 -0000
@@ -552,7 +552,7 @@ function comment_node_view($node, $build
     }
 
     $node->content['links']['comment'] = array(
-      '#theme' => 'links',
+      '#theme' => array('links__comment_node', 'links'),
       '#links' => $links,
       '#attributes' => array('class' => array('links', 'inline')),
     );
@@ -836,7 +836,7 @@ function comment_build_content($comment,
 
   if (empty($comment->in_preview)) {
     $comment->content['links']['comment'] = array(
-      '#theme' => 'links',
+      '#theme' => array('links__comment', 'links'),
       '#links' => comment_links($comment, $node),
       '#attributes' => array('class' => array('links', 'inline')),
     );
Index: modules/forum/forums.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forums.tpl.php,v
retrieving revision 1.6
diff -u -p -r1.6 forums.tpl.php
--- modules/forum/forums.tpl.php	9 Oct 2009 00:59:59 -0000	1.6
+++ modules/forum/forums.tpl.php	16 Nov 2009 21:41:54 -0000
@@ -20,7 +20,7 @@
 ?>
 <?php if ($forums_defined): ?>
 <div id="forum">
-  <?php print theme('links', array('links' => $links)); ?>
+  <?php print theme(array('links__forum', 'links'), array('links' => $links)); ?>
   <?php print $forums; ?>
   <?php print $topics; ?>
 </div>
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.268
diff -u -p -r1.268 locale.module
--- modules/locale/locale.module	10 Nov 2009 17:27:53 -0000	1.268
+++ modules/locale/locale.module	16 Nov 2009 21:41:41 -0000
@@ -888,7 +888,7 @@ function locale_block_view($type) {
     if (isset($links->links) && count($links->links > 1)) {
       $class = "language-switcher-{$links->provider}";
       $variables = array('links' => $links->links, 'attributes' => array('class' => array($class)));
-      $block['content'] = theme('links', $variables);
+      $block['content'] = theme(array('links__locale_block', 'links'), $variables);
       $block['subject'] = t('Languages');
       return $block;
     }
Index: modules/node/node.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v
retrieving revision 1.77
diff -u -p -r1.77 node.admin.inc
--- modules/node/node.admin.inc	14 Nov 2009 07:58:49 -0000	1.77
+++ modules/node/node.admin.inc	16 Nov 2009 21:43:01 -0000
@@ -394,7 +394,7 @@ function node_admin_content($form, $form
   // Show the 'add new content' link.
   $form['add_content'] = array(
     '#access' => _node_add_access(),
-    '#markup' => theme('links', array('links' => array(array('title' => t('Add new content'), 'href' => 'node/add')), 'attributes' => array('class' => array('action-links')))),
+    '#markup' => theme(array('links__node_admin', 'links'), array('links' => array(array('title' => t('Add new content'), 'href' => 'node/add')), 'attributes' => array('class' => array('action-links')))),
   );
   $form['filter'] = node_filter_form();
   $form['#submit'][] = 'node_filter_form_submit';
@@ -522,7 +522,7 @@ function node_admin_nodes() {
       // Render an unordered list of operations links.
       $options[$node->nid]['operations'] = array(
         'data' => array(
-          '#theme' => 'links',
+          '#theme' => array('links__node_operations', 'links'),
           '#links' => $operations,
           '#attributes' => array('class' => array('links', 'inline')),
         ),
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1168
diff -u -p -r1.1168 node.module
--- modules/node/node.module	15 Nov 2009 00:23:57 -0000	1.1168
+++ modules/node/node.module	16 Nov 2009 21:37:39 -0000
@@ -1217,7 +1217,7 @@ function node_build_content($node, $buil
     );
   }
   $node->content['links']['node'] = array(
-    '#theme' => 'links',
+    '#theme' => array('links__node', 'links'),
     '#links' => $links,
     '#attributes' => array('class' => array('links', 'inline')),
   );
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.323
diff -u -p -r1.323 poll.module
--- modules/poll/poll.module	8 Nov 2009 10:02:41 -0000	1.323
+++ modules/poll/poll.module	16 Nov 2009 21:43:37 -0000
@@ -809,7 +809,7 @@ function theme_poll_choices($variables) 
  * @see theme_poll_results()
  */
 function template_preprocess_poll_results(&$variables) {
-  $variables['links'] = theme('links', array('links' => $variables['raw_links']));
+  $variables['links'] = theme(array('links__poll_results', 'links'), array('links' => $variables['raw_links']));
   if (isset($variables['vote']) && $variables['vote'] > -1 && user_access('cancel own vote')) {
     $variables['cancel_form'] = drupal_render(drupal_get_form('poll_cancel_form', $variables['nid']));
   }
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.324
diff -u -p -r1.324 statistics.module
--- modules/statistics/statistics.module	8 Nov 2009 10:02:41 -0000	1.324
+++ modules/statistics/statistics.module	16 Nov 2009 21:37:54 -0000
@@ -114,7 +114,7 @@ function statistics_node_view($node, $bu
     }
 
     $node->content['links']['statistics'] = array(
-      '#theme' => 'links',
+      '#theme' => array('links__statistics_node', 'links'),
       '#links' => $links,
       '#attributes' => array('class' => array('links', 'inline')),
     );
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.38
diff -u -p -r1.38 page.tpl.php
--- modules/system/page.tpl.php	16 Nov 2009 05:34:24 -0000	1.38
+++ modules/system/page.tpl.php	16 Nov 2009 21:45:01 -0000
@@ -92,7 +92,7 @@
 
     <?php if ($main_menu): ?>
       <div id="navigation"><div class="section">
-        <?php print theme('links', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php print theme(array('links__system_main_menu', 'links'), array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
 
@@ -130,7 +130,7 @@
     </div></div> <!-- /#main, /#main-wrapper -->
 
     <div id="footer"><div class="section">
-      <?php print theme('links', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
+      <?php print theme(array('links__system_secondary_menu', 'links'), array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       <?php print render($page['footer']); ?>
     </div></div> <!-- /.section, /#footer -->
 
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.842
diff -u -p -r1.842 system.module
--- modules/system/system.module	16 Nov 2009 05:11:01 -0000	1.842
+++ modules/system/system.module	16 Nov 2009 21:38:26 -0000
@@ -3625,7 +3625,7 @@ function system_build_contextual_links($
   $build = array();
   if ($links) {
     $build = array(
-      '#theme' => 'links',
+      '#theme' => array('links__system_contextual_links', 'links'),
       '#links' => $links,
       '#attributes' => array('class' => array('contextual-links')),
       '#attached' => array(
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.20
diff -u -p -r1.20 toolbar.module
--- modules/toolbar/toolbar.module	15 Nov 2009 21:13:26 -0000	1.20
+++ modules/toolbar/toolbar.module	16 Nov 2009 21:38:55 -0000
@@ -162,7 +162,7 @@ function toolbar_build() {
   $main_menu = menu_load('management');
   $links = toolbar_menu_navigation_links(toolbar_get_menu_tree());
   $build['toolbar_menu'] = array(
-    '#theme' => 'links',
+    '#theme' => array('links__toolbar_menu', 'links'),
     '#links' => $links,
     '#attributes' => array('id' => 'toolbar-menu'),
     '#heading' => array('text' => $main_menu['title'], 'level' => 'h2', 'class' => 'element-invisible'),
@@ -191,7 +191,7 @@ function toolbar_build() {
     );
   }
   $build['toolbar_user'] = array(
-    '#theme' => 'links',
+    '#theme' => array('links__toolbar_user', 'links'),
     '#links' => $links,
     '#attributes' => array('id' => 'toolbar-user'),
   );
Index: modules/translation/translation.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v
retrieving revision 1.64
diff -u -p -r1.64 translation.module
--- modules/translation/translation.module	8 Nov 2009 10:02:41 -0000	1.64
+++ modules/translation/translation.module	16 Nov 2009 21:39:09 -0000
@@ -177,7 +177,7 @@ function translation_node_view($node, $b
       // Do not show link to the same node.
       unset($links[$node->language]);
       $node->content['links']['translation'] = array(
-        '#theme' => 'links',
+        '#theme' => array('links__translation_node', 'links'),
         '#links' => $links,
         '#attributes' => array('class' => array('links', 'inline')),
       );
Index: modules/update/update.report.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.report.inc,v
retrieving revision 1.27
diff -u -p -r1.27 update.report.inc
--- modules/update/update.report.inc	23 Oct 2009 22:24:19 -0000	1.27
+++ modules/update/update.report.inc	16 Nov 2009 21:46:37 -0000
@@ -300,7 +300,7 @@ function theme_update_version($variables
     'title' => t('Release notes'),
     'href' => $version['release_link'],
   );
-  $output .= theme('links', array('links' => $links));
+  $output .= theme(array('links__update_version', 'links'), array('links' => $links));
   $output .= '</td>';
   $output .= '</tr>';
   $output .= "</table>\n";
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.269
diff -u -p -r1.269 upload.module
--- modules/upload/upload.module	8 Nov 2009 10:02:41 -0000	1.269
+++ modules/upload/upload.module	16 Nov 2009 21:39:19 -0000
@@ -76,7 +76,7 @@ function upload_node_links($node, $build
       'fragment' => 'attachments'
     );
     $node->content['links']['upload_attachments'] = array(
-      '#theme' => 'links',
+      '#theme' => array('links__upload_node', 'links'),
       '#links' => $links,
       '#attributes' => array('class' => array('links', 'inline')),
     );
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.33
diff -u -p -r1.33 template.php
--- themes/garland/template.php	9 Oct 2009 01:00:08 -0000	1.33
+++ themes/garland/template.php	16 Nov 2009 21:47:48 -0000
@@ -38,7 +38,7 @@ function garland_process_html(&$vars) {
 function garland_preprocess_page(&$vars) {
   $vars['tabs2'] = menu_secondary_local_tasks();
   if (isset($vars['main_menu'])) {
-    $vars['primary_nav'] = theme('links', array(
+    $vars['primary_nav'] = theme(array('links__system_main_menu', 'links'), array(
       'links' => $vars['main_menu'],
       'attributes' => array(
         'class' => array('links', 'main-menu'),
@@ -54,7 +54,7 @@ function garland_preprocess_page(&$vars)
     $vars['primary_nav'] = FALSE;
   }
   if (isset($vars['secondary_menu'])) {
-    $vars['secondary_nav'] = theme('links', array(
+    $vars['secondary_nav'] = theme(array('links__system_secondary_menu', 'links'), array(
       'links' => $vars['secondary_menu'],
       'attributes' => array(
         'class' => array('links', 'secondary-menu'),