=== modified file 'modules/blog/blog.test'
--- modules/blog/blog.test	2008-12-06 09:01:58 +0000
+++ modules/blog/blog.test	2009-02-07 01:44:24 +0000
@@ -115,7 +115,7 @@
     $this->drupalGet('node/' . $node->nid . '/edit');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertTitle($node->title. ' | Drupal', t('Blog edit node was displayed'));
+      $this->assertTitle('Edit Blog entry ' . $node->title. ' | Drupal', t('Blog edit node was displayed'));
       $this->assertText(t('Home ' . $crumb . ' @title', array('@title' => $node->title)), t('Breadcrumbs were displayed'));
     }
 

=== modified file 'modules/forum/forum.test'
--- modules/forum/forum.test	2009-01-28 02:00:13 +0000
+++ modules/forum/forum.test	2009-02-07 01:44:36 +0000
@@ -313,7 +313,7 @@
     $this->drupalGet('node/' . $node->nid . '/edit');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertTitle($node->title . ' | Drupal', t('Forum edit node was displayed'));
+      $this->assertTitle('Edit Forum topic ' . $node->title . ' | Drupal', t('Forum edit node was displayed'));
       $this->assertText(t('Home ' . $crumb . ' @title', array('@title' => $node->title)), t('Breadcrumbs were displayed'));
     }
 

=== modified file 'modules/node/node.pages.inc'
--- modules/node/node.pages.inc	2009-02-05 04:00:08 +0000
+++ modules/node/node.pages.inc	2009-02-07 01:37:36 +0000
@@ -11,7 +11,8 @@
  * Menu callback; presents the node editing form, or redirects to delete confirmation.
  */
 function node_page_edit($node) {
-  drupal_set_title($node->title);
+  $type_name = node_get_types('name', $node);
+  drupal_set_title('<em>'. t('Edit @type ', array('@type' => $type_name)) . '</em>' . check_plain($node->title), PASS_THROUGH);
   return drupal_get_form($node->type . '_node_form', $node);
 }