Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.525
diff -u -p -r1.525 comment.module
--- modules/comment/comment.module	15 Feb 2007 11:40:18 -0000	1.525
+++ modules/comment/comment.module	16 Feb 2007 17:37:01 -0000
@@ -1561,6 +1561,8 @@ function comment_form($edit, $title = NU
     $form['submit'] = array('#type' => 'submit', '#value' => t('Post comment'), '#weight' => 20);
   }
 
+  $form['cancel'] = array('#type' => 'markup', '#value' => l(t('Cancel'), 'node/' . $edit['nid']), '#weight' => 21);
+
   if ($op == t('Preview comment')) {
     $form['#after_build'] = array('comment_form_add_preview');
   }
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.783
diff -u -p -r1.783 node.module
--- modules/node/node.module	15 Feb 2007 11:40:18 -0000	1.783
+++ modules/node/node.module	16 Feb 2007 17:37:04 -0000
@@ -2037,6 +2037,7 @@ function node_form($node, $form_values =
   if (!empty($node->nid) && node_access('delete', $node)) {
     $form['delete'] = array('#type' => 'button', '#value' => t('Delete'), '#weight' => 50);
   }
+  $form['cancel'] = array('#type' => 'markup', '#value' => l(t('Cancel'), 'node/' . $node->nid), '#weight' => 51);
   $form['#after_build'] = array('node_form_add_preview');
   $form['#base'] = 'node_form';
   return $form;
@@ -2088,6 +2089,7 @@ function theme_node_form($form) {
   $buttons = drupal_render($form['preview']);
   $buttons .= drupal_render($form['submit']);
   $buttons .= isset($form['delete']) ? drupal_render($form['delete']) : '';
+  $buttons .= drupal_render($form['cancel']);
 
   // Everything else gets rendered here, and is displayed before the admin form
   // field and the submit buttons.