Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.49
diff -u -r1.49 menu.admin.inc
--- modules/menu/menu.admin.inc	7 Jun 2009 02:30:13 -0000	1.49
+++ modules/menu/menu.admin.inc	27 Jun 2009 18:07:38 -0000
@@ -65,7 +65,7 @@
     );
   }
   else {
-    $form['empty_menu'] = array('#markup' => t('There are no menu links yet.'));
+    $form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a> now.', array('@link' => url('admin/build/menu-customize/'. $form['#menu']['menu_name'] .'/add')));
   }
   return $form;
 }
@@ -228,9 +228,10 @@
     }
   }
   $output = '';
-  if ($rows) {
-    $output .= theme('table', $header, $rows, array('id' => 'menu-overview'));
+  if (empty($rows)) {
+    $rows[] = array(array('data' => $form['#empty_text'], 'colspan' => '7'));
   }
+  $output .= theme('table', $header, $rows, array('id' => 'menu-overview'));
   $output .= drupal_render_children($form);
   return $output;
 }