        }
        else {
          $settings['toggle_favicon'] = FALSE;
-@@ -1203,7 +1203,7 @@ function theme_links($links, $attributes
+@@ -1212,7 +1212,7 @@ function theme_links($links, $attributes
  function theme_image($path, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) {
    if (!$getsize || (is_file($path) && (list($width, $height, $type, $image_attributes) = @getimagesize($path)))) {
      $attributes = drupal_attributes($attributes);

   }
 }
 
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.415.2.19
diff -u -F^f -r1.415.2.19 theme.inc
--- includes/theme.inc	25 Feb 2009 21:02:16 -0000	1.415.2.19
+++ includes/theme.inc	17 May 2009 20:28:08 -0000
@@ -965,24 +965,24 @@ function theme_get_setting($setting_name
 
     if ($settings['toggle_logo']) {
       if ($settings['default_logo']) {

retrieving revision 1.16.2.1
diff -u -F^f -r1.16.2.1 template.php
--- themes/garland/template.php	25 Feb 2009 11:47:37 -0000	1.16.2.1
+++ themes/garland/template.php	22 Jun 2009 20:01:44 -0000
@@ -93,9 +93,9 @@ function phptemplate_node_submitted($nod
 function phptemplate_get_ie_styles() {
   global $language;
