 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	17 May 2009 20:28:19 -0000
++++ 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;

Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.756.2.47
diff -u -F^f -r1.756.2.47 common.inc
--- includes/common.inc	25 Feb 2009 21:02:36 -0000	1.756.2.47
+++ includes/common.inc	17 May 2009 20:28:05 -0000
@@ -1830,15 +1830,15 @@ function drupal_get_css($css = NULL) {
             // If a CSS file is not to be preprocessed and it's a module CSS file, it needs to *always* appear at the *top*,
             // regardless of whether preprocessing is on or off.

       }
       else {
         $settings['toggle_favicon'] = FALSE;
@@ -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);
