Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.765
diff -u -p -r1.765 node.module
--- modules/node/node.module	4 Jan 2007 09:53:58 -0000	1.765
+++ modules/node/node.module	4 Jan 2007 18:03:20 -0000
@@ -146,7 +146,7 @@ function node_teaser($body, $format = NU
   $size = variable_get('teaser_length', 600);
 
   // Find where the delimiter is in the body
-  $delimiter = strpos($body, '<break>');
+  $delimiter = strpos($body, variable_get('node_teaser_break', '<!--break-->'));
 
   // If the size is zero, and there is no delimiter, the entire body is the teaser.
   if ($size == 0 && $delimiter === FALSE) {
@@ -738,7 +738,7 @@ function node_prepare($node, $teaser = F
  */
 function node_build_content($node, $teaser = FALSE, $page = FALSE) {
   // Remove the delimiter (if any) that separates the teaser from the body.
-  $node->body = str_replace('<break>', '', $node->body);
+  $node->body = str_replace(variable_get('node_teaser_break', '<!--break-->'), '', $node->body);
 
   // The 'view' hook can be implemented to overwrite the default function
   // to display nodes.
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.66
diff -u -p -r1.66 system.install
--- modules/system/system.install	3 Jan 2007 11:10:58 -0000	1.66
+++ modules/system/system.install	4 Jan 2007 18:03:23 -0000
@@ -3452,18 +3452,9 @@ function system_update_1017() {
 }
 
 /**
- * Change break tag.
- */
-function system_update_1018() {
-  $ret = array();
-  $ret[] = update_sql("UPDATE {node_revisions} SET body = REPLACE(body, '<!--break-->', '<break>')");
-  return $ret;
-}
-
-/**
  * Change variable format for user-defined e-mails.
  */
-function system_update_1019() {
+function system_update_1018() {
   $message_ids = array('welcome_subject', 'welcome_body',
                        'approval_subject', 'approval_body',
                        'pass_subject', 'pass_body',