Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.641
diff -u -p -r1.641 common.inc
--- includes/common.inc 15 May 2007 20:19:47 -0000      1.641
+++ includes/common.inc 21 May 2007 13:28:58 -0000
@@ -1527,15 +1527,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.
           if (!$preprocess && $type == 'module') {
-            $no_module_preprocess .= '<style type="text/css" media="'. $media .'">@import "'. base_path() . $file .'";</style>' ."\n";
+            $no_module_preprocess .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() .
$file .'" />'."\n";
           }
           // If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*,
           // regardless of whether preprocessing is on or off.
           else if (!$preprocess && $type == 'theme') {
-            $no_theme_preprocess .= '<style type="text/css" media="'. $media .'">@import "'. base_path() . $file .'";</style>' ."\n";
+            $no_theme_preprocess .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file .'" />'."\n";
           }
           else {
-            $output .= '<style type="text/css" media="'. $media .'">@import "'. base_path() . $file .'";</style>' ."\n";
+            $output .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file . '" />'."\n";
           }
         }
       }
@@ -1544,7 +1544,7 @@ function drupal_get_css($css = NULL) {
     if ($is_writable && $preprocess_css) {
       $filename = md5(serialize($types)) .'.css';
       $preprocess_file = drupal_build_css_cache($types, $filename);
-      $output .= '<style type="text/css" media="'. $media .'">@import "'. base_path() . $preprocess_file .'";</style>'. "\n";
+      $output .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $preprocess_file .'" />'."\n";
     }
   }

Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.355
diff -u -p -r1.355 theme.inc
--- includes/theme.inc  6 May 2007 05:47:51 -0000       1.355
+++ includes/theme.inc  21 May 2007 13:28:58 -0000
@@ -796,9 +796,9 @@ function theme_placeholder($text) {
 function theme_maintenance_page($content, $show_messages = TRUE) {
   // Set required headers.
   drupal_set_header('Content-Type: text/html; charset=utf-8');
-  drupal_set_html_head('<style type="text/css" media="all">@import "'. base_path() .'misc/maintenance.css";</style>');
-  drupal_set_html_head('<style type="text/css" media="all">@import "'. base_path() . drupal_get_path('module', 'system')
.'/defaults.css";</style>');
-  drupal_set_html_head('<style type="text/css" media="all">@import "'. base_path() . drupal_get_path('module', 'system')
.'/system.css";</style>');
+  drupal_set_html_head('<style type="text/css" media="all" href="'. base_path() .'misc/maintenance.css"></style>');
+  drupal_set_html_head('<style type="text/css" media="all" href="'. base_path() . drupal_get_path('module', 'system') .'/defaults.css"></style>');
+  drupal_set_html_head('<style type="text/css" media="all" href="'. base_path() . drupal_get_path('module', 'system') .'/system.css"></style>');
   drupal_set_html_head('<link rel="shortcut icon" href="'. base_path() .'misc/favicon.ico" type="image/x-icon" />');

   // Prepare variables.
Index: misc/maintenance.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/misc/maintenance.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 maintenance.tpl.php
--- misc/maintenance.tpl.php    5 Mar 2007 16:15:22 -0000       1.2
+++ misc/maintenance.tpl.php    21 May 2007 13:28:58 -0000
@@ -6,9 +6,9 @@
     <?php print $head ?>
     <?php print $styles ?>
     <?php print $scripts ?>
-    <style type="text/css" media="all">@import "<?php print $path_to_theme ?>/style.css";</style>
+    <style type="text/css" media="all" href="<?php print $path_to_theme ?>/style.css"></style>
     <!--[if lt IE 7]>
-    <style type="text/css" media="all">@import "<?php print $path_to_theme ?>/fix-ie.css";</style>
+    <style type="text/css" media="all" href="<?php print $path_to_theme ?>/fix-ie.css"></style>
     <![endif]-->
   </head>
   <body class="<?php
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.420
diff -u -p -r1.420 book.module
--- modules/book/book.module    14 May 2007 13:43:34 -0000      1.420
+++ modules/book/book.module    21 May 2007 13:28:59 -0000
@@ -708,7 +708,7 @@ function theme_book_export_html($title,
   $html .= "<head>\n<title>". $title ."</title>\n";
   $html .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
   $html .= '<base href="'. $base_url .'/" />'."\n";
-  $html .= "<style type=\"text/css\">\n@import url(misc/print.css);\n</style>\n";
+  $html .= "<style type=\"text/css\" href=\"misc/print.css\"></style>\n";
   $html .= "</head>\n<body>\n". $content ."\n</body>\n</html>\n";
   return $html;
 }
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.7
diff -u -p -r1.7 page.tpl.php
--- themes/garland/page.tpl.php 4 May 2007 09:41:37 -0000       1.7
+++ themes/garland/page.tpl.php 21 May 2007 13:28:59 -0000
@@ -6,9 +6,9 @@
     <?php print $head ?>
     <?php print $styles ?>
     <?php print $scripts ?>
-    <style type="text/css" media="print">@import "<?php print base_path() . path_to_theme() ?>/print.css";</style>
+    <style type="text/css" media="print" href="<?php print base_path() . path_to_theme() ?>/print.css"></style>
     <!--[if lt IE 7]>
-    <style type="text/css" media="all">@import "<?php print base_path() . path_to_theme() ?>/fix-ie.css";</style>
+    <style type="text/css" media="all" href="<?php print base_path() . path_to_theme() ?>/fix-ir.css"></style>
     <![endif]-->
   </head>
   <body<?php print phptemplate_body_class($sidebar_left, $sidebar_right); ?>>