Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.601
diff -u -F^f -r1.601 common.inc
--- includes/common.inc	12 Dec 2006 06:13:34 -0000	1.601
+++ includes/common.inc	14 Dec 2006 09:02:13 -0000
@@ -1487,10 +1487,10 @@ function drupal_build_css_cache($types, 
           $contents = file_get_contents($file);
           // Return the path to where this CSS file originated from, stripping off the name of the file at the end of the path.
           $path = base_path() . substr($file, 0, strrpos($file, '/')) .'/';
+          // Wraps all @import arguments in url().
+          $contents = preg_replace('/@import\s(?!url)[\'"]?(\S*)\b[\'"]?/i', '@import url("\1");', $contents);
           // Fix all paths within this CSS file, ignoring absolute paths.
-          $contents = preg_replace('/url\(([\'"]?)(?![a-z]+:)/i', 'url(\1'. $path . '\2', $contents);
-          // Fix any @import that don't use url() and is not absoslute.
-          $data .= preg_replace('/@import\s*([\'"]?)(?![a-z]+:)/i', '@import \1'. $path . '\2', $contents);
+          $data .= preg_replace('/url\(([\'"]?)(?![a-z]+:)/i', 'url(\1'. $path . '\2', $contents);
         }
       }
     }