Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal/drupal/CHANGELOG.txt,v
retrieving revision 1.298
diff -u -p -r1.298 CHANGELOG.txt
--- CHANGELOG.txt	9 Mar 2009 20:41:25 -0000	1.298
+++ CHANGELOG.txt	12 Mar 2009 14:36:16 -0000
@@ -75,7 +75,10 @@ Drupal 7.0, xxxx-xx-xx (development vers
       allowing Drupal to lazy-load code as needed, resulting in significant performance
       and memory improvements.
 - Theme system:
-    * Converted the 'bluemarine' theme to a tableless layout.
+    * Removed the Bluemarine, Chameleon and Pushbutton themes. These themes live
+      on as contributed themes (http://drupal.org/project/bluemarine,
+      http://drupal.org/project/chameleon and http://drupal.org/project/pushbutton).
+    * Added Stark theme to make analyzing Drupal's default HTML and CSS easier.
 - File handling:
     * Files are now first class Drupal objects with file_load(), file_save(),
       and file_validate() functions and corresponding hooks.
Index: modules/block/block.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.test,v
retrieving revision 1.11
diff -u -p -r1.11 block.test
--- modules/block/block.test	11 Feb 2009 03:38:46 -0000	1.11
+++ modules/block/block.test	12 Mar 2009 14:36:16 -0000
@@ -166,8 +166,8 @@ class NonDefaultBlockAdmin extends Drupa
   function testNonDefaultBlockAdmin() {
     $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer site configuration'));
     $this->drupalLogin($admin_user);
-    $this->drupalPost('admin/build/themes', array('status[bluemarine]' => 1), t('Save configuration'));
-    $this->drupalGet('admin/build/block/list/bluemarine');
-    $this->assertRaw('bluemarine/style.css', t('Bluemarine CSS found'));
+    $this->drupalPost('admin/build/themes', array('status[stark]' => 1), t('Save configuration'));
+    $this->drupalGet('admin/build/block/list/stark');
+    $this->assertRaw('stark/layout.css', t('Stark CSS found'));
   }
 }