Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1204
diff -u -p -u -p -r1.1204 common.inc
--- includes/common.inc	10 Aug 2010 01:00:42 -0000	1.1204
+++ includes/common.inc	17 Aug 2010 17:08:54 -0000
@@ -2887,15 +2887,14 @@ function drupal_group_css($css) {
     // item can't be grouped with other items, set $group_keys to FALSE. We
     // put items into a group that can be aggregated together: whether they will
     // be aggregated is up to the _drupal_css_aggregate() function or an
-    // override of that function specified in hook_css_alter(), but regardless
-    // of the details of that function, a group represents items that can be
-    // aggregated. Since a group may be rendered with a single HTML tag, all
-    // items in the group must share the same information that would need to be
-    // part of that HTML tag.
+    // override of that function specified in hook_css_alter().
+    // Since a group may be rendered with a single HTML tag, all items in the
+    // group must share the same information that would need to be part of that
+    // HTML tag.
     switch ($item['type']) {
       case 'file':
         // Group file items if their 'preprocess' flag is TRUE.
-        $group_keys = $item['preprocess'] ? array($item['type'], $item['media'], $item['browsers']) : FALSE;
+        $group_keys = array($item['type'], $item['media'], $item['browsers'], $item['preprocess']);
         break;
       case 'inline':
         // Always group inline items.
@@ -3085,9 +3084,9 @@ function drupal_pre_render_styles($eleme
           $element['#browsers'] = $group['browsers'];
           $elements[] = $element;
         }
-        // The group can be aggregated, but hasn't been: combine multiple items
-        // into as few STYLE tags as possible.
-        elseif ($group['preprocess']) {
+        // A group of non-aggregated files: combine multiple items into as few
+        // STYLE tags as possible.
+        else {
           $import = array();
           foreach ($group['items'] as $item) {
             // The dummy query string needs to be added to the URL to control
@@ -3109,20 +3108,6 @@ function drupal_pre_render_styles($eleme
             $elements[] = $element;
           }
         }
-        // The group contains items ineligible for aggregation: output a LINK
-        // tag for each file.
-        else {
-          foreach ($group['items'] as $item) {
-            $element = $link_element_defaults;
-            // The dummy query string needs to be added to the URL to control
-            // browser-caching.
-            $query_string_separator = (strpos($item['data'], '?') !== FALSE) ? '&' : '?';
-            $element['#attributes']['href'] = file_create_url($item['data']) . $query_string_separator . $query_string;
-            $element['#attributes']['media'] = $item['media'];
-            $element['#browsers'] = $group['browsers'];
-            $elements[] = $element;
-          }
-        }
         break;
       // For inline content, the 'data' property contains the CSS content. If
       // the group's 'data' property is set, then output it in a single STYLE
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.953
diff -u -p -u -p -r1.953 system.module
--- modules/system/system.module	9 Aug 2010 16:54:50 -0000	1.953
+++ modules/system/system.module	17 Aug 2010 17:08:54 -0000
@@ -1064,9 +1064,8 @@ function system_library() {
     'website' => 'http://jquery.com',
     'version' => '1.4.2',
     'js' => array(
-      'misc/jquery.js' => array('weight' => JS_LIBRARY - 20),
+      'misc/jquery.js' => array('preprocess' => TRUE, 'weight' => JS_LIBRARY - 20),
     ),
-    'preprocess' => TRUE,
   );
 
   // jQuery Once.
@@ -1075,9 +1074,8 @@ function system_library() {
     'website' => 'http://plugins.jquery.com/project/once',
     'version' => '1.2',
     'js' => array(
-      'misc/jquery.once.js' => array('weight' => JS_LIBRARY - 19),
+      'misc/jquery.once.js' => array('preprocess' => TRUE, 'weight' => JS_LIBRARY - 19),
     ),
-    'preprocess' => TRUE,
   );
 
   // jQuery Form Plugin.