Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.22
diff -u -r1.22 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	3 Nov 2005 19:40:36 -0000	1.22
+++ themes/engines/phptemplate/phptemplate.engine	21 Dec 2005 14:49:17 -0000
@@ -222,6 +222,15 @@
  * into a pluggable template engine.
  */
 function phptemplate_node($node, $teaser = 0, $page = 0) {
+
+  $last_revised = '';
+
+  if (theme_get_setting('toggle_revision_info_' . $node->type) && ($node->changed != 0) && ($node->created != $node->changed))
+  {
+    $last_revised = t(' | Last revised on %a.',
+    array('%a' => format_date($node->changed)));
+  } 
+
   if (module_exist('taxonomy')) {
     $taxonomy = taxonomy_link('taxonomy terms', $node);
   }
@@ -248,7 +257,7 @@
 
   // Display info only on certain node types.
   if (theme_get_setting('toggle_node_info_' . $node->type)) {
-    $variables['submitted'] =  t('Submitted by %a on %b.', array('%a' => theme('username', $node), '%b' => format_date($node->created)));
+    $variables['submitted'] =  t('Submitted by %a on %b.', array('%a' => theme('username', $node), '%b' => format_date($node->created))) . $last_revised;
     $variables['picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
   }
 
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.269
diff -u -r1.269 system.module
--- modules/system.module	16 Dec 2005 19:57:41 -0000	1.269
+++ modules/system.module	21 Dec 2005 14:49:17 -0000
@@ -1106,10 +1106,14 @@
     $node_types = module_invoke('node', 'get_types');
     if ($node_types) {
       $group = '';
-      $form['node_info'] = array('#type' => 'fieldset', '#title' => t('Display post information on'), '#description' =>  t('Enable or disable the "submitted by Username on date" text when displaying posts of the above type'));
+      $form['node_info'] = array('#type' => 'fieldset', '#title' => t('Post submission information display'), '#description' =>  t('Enable or disable the "Submitted by username on date" text when displaying posts of the above type'));
       foreach ($node_types as $type => $name) {
         $form['node_info']["toggle_node_info_$type"] = array('#type' => 'checkbox', '#title' => $name, '#default_value' => $settings["toggle_node_info_$type"]);
       }
+      $form['revision_info'] = array('#type' => 'fieldset', '#title' => t('Post revision information display'), '#description' =>  t('Enable or disable the "Last revised on date" text when displaying posts of the above type'));
+      foreach ($node_types as $type => $name) {
+        $form['revision_info']["toggle_revision_info_$type"] = array('#type' => 'checkbox', '#title' => $name, '#default_value' => $settings["toggle_revision_info_$type"]);
+      }
     }
   }
 
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.569
diff -u -r1.569 node.module
--- modules/node.module	21 Dec 2005 14:30:09 -0000	1.569
+++ modules/node.module	21 Dec 2005 14:49:17 -0000
@@ -425,8 +425,16 @@
     }
   }
 
-  // The changed timestamp is always updated for bookkeeping purposes (revisions, searching, ...)
-  $node->changed = time();
+  // If node has never changed, set $node->changed to $node->created
+  // If we set $node->created to time(), then 'changed' and 'created' will be
+  // different for new nodes which were previewed before submission
+  if (!$node->changed) {
+    $node->changed = $node->created;
+  }
+  else {
+    // The changed timestamp is always updated for bookkeeping purposes (revisions, searching, ...)
+    $node->changed = time();
+  }
 
   // Split off revisions data to another structure
   $revisions_table_values = array('nid' => $node->nid, 'vid' => $node->vid,