diff -urp zen/template.block-editing.inc zen/template.block-editing.inc
--- zen/template.block-editing.inc	2009-02-13 02:34:31.000000000 -0500
+++ zen/template.block-editing.inc	2009-04-26 15:12:09.000000000 -0400
@@ -17,6 +17,18 @@
 function zen_preprocess_block_editing(&$vars, $hook) {
   $block = $vars['block'];
 
+  // Check to see if any modules have added edit links.
+  if (isset($vars['edit_links'])) {
+    // If the edit_links var is an array of links, zen will add it's links below.
+    if (is_array($vars['edit_links'])) {
+      $edit_links = $vars['edit_links'];
+    }
+    // Otherwise, just return.
+    elseif ($vars['edit_links']) {
+      return;
+    }
+  }
+
   // Display 'edit block' for custom blocks.
   if ($block->module == 'block') {
     $edit_links[] = l('<span>' . t('edit block') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta,