Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.18
diff -u -r1.18 template.php
--- themes/garland/template.php	28 Apr 2008 09:25:27 -0000	1.18
+++ themes/garland/template.php	8 May 2008 15:13:24 -0000
@@ -37,16 +37,15 @@
 
   // Prepare header
   $site_fields = array();
+  $site_title = '';
   if (!empty($vars['site_name'])) {
-    $site_fields[] = check_plain($vars['site_name']);
+    $site_title = check_plain($vars['site_name']);
+    $site_fields[] = '<span id="site-name">' . $site_title . '</span>';
   }
   if (!empty($vars['site_slogan'])) {
-    $site_fields[] = check_plain($vars['site_slogan']);
-  }
-  $vars['site_title'] = implode(' ', $site_fields);
-  if (!empty($site_fields)) {
-    $site_fields[0] = '<span>'. $site_fields[0] .'</span>';
+    $site_fields[] = '<span id="site-slogan">' . check_plain($vars['site_slogan']) . '</span>';
   }
+  $vars['site_title'] = $site_title;
   $vars['site_html'] = implode(' ', $site_fields);
 
   // Hook into color.module