Index: modules/help/help.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.admin.inc,v
retrieving revision 1.11
diff -u -p -r1.11 help.admin.inc
--- modules/help/help.admin.inc	13 Oct 2009 05:26:57 -0000	1.11
+++ modules/help/help.admin.inc	12 Feb 2010 03:11:27 -0000
@@ -45,25 +45,42 @@ function help_page($name) {
   return $output;
 }
 
+/**
+ * Display help topics.
+ */
 function help_links_as_list() {
   $empty_arg = drupal_help_arg();
   $module_info = system_rebuild_module_data();
 
-  $modules = array();
+  $items = array();
   foreach (module_implements('help', TRUE) as $module) {
     if (module_invoke($module, 'help', "admin/help#$module", $empty_arg)) {
-      $modules[$module] = $module_info[$module]->info['name'];
+      $name = $module_info[$module]->info['name'];
+      $items[$module] = l($name, 'admin/help/' . $module);
     }
   }
-  asort($modules);
+  asort($items);
+  return theme('help_list', array('items' => $items));
+}
+
+/**
+ * Format a listing of help topics.
+ */
+function theme_help_list($variables) {
+  $items = $variables['items'];
+  $output = '';
 
-  // Output pretty four-column list
-  $count = count($modules);
+  $count = count($items);
+  if ($count == 0) {
+    return $output;
+  }
+
+  // Output pretty four-column list.
   $break = ceil($count / 4);
-  $output = '<div class="clearfix"><div class="help-items"><ul>';
+  $output .= '<div class="clearfix"><div class="help-items"><ul>';
   $i = 0;
-  foreach ($modules as $module => $name) {
-    $output .= '<li>' . l($name, 'admin/help/' . $module) . '</li>';
+  foreach ($items as $item) {
+    $output .= '<li>' . $item . '</li>';
     if (($i + 1) % $break == 0 && ($i + 1) != $count) {
       $output .= '</ul></div><div class="help-items' . ($i + 1 == $break * 3 ? ' help-items-last' : '') . '"><ul>';
     }
@@ -73,4 +90,3 @@ function help_links_as_list() {
 
   return $output;
 }
-
Index: modules/help/help.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.module,v
retrieving revision 1.96
diff -u -p -r1.96 help.module
--- modules/help/help.module	12 Jan 2010 23:04:47 -0000	1.96
+++ modules/help/help.module	12 Feb 2010 03:00:54 -0000
@@ -62,3 +62,15 @@ function help_help($path, $arg) {
       return $output;
   }
 }
+
+/**
+ * Implements hook_theme().
+ */
+function help_theme() {
+  return array(
+    'help_list' => array(
+      'variables' => array('items' => array()),
+      'file' => 'help.admin.inc',
+    ),
+  );
+}