Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1120
diff -u -p -r1.1120 common.inc
--- includes/common.inc	3 Mar 2010 19:55:46 -0000	1.1120
+++ includes/common.inc	5 Mar 2010 06:21:22 -0000
@@ -2984,6 +2984,12 @@ function drupal_pre_render_styles($eleme
   // URL changed.
   $query_string = substr(variable_get('css_js_query_string', '0'), 0, 1);
 
+  // For inline CSS to validate as XHTML, all CSS containing XHTML needs to be
+  // wrapped in CDATA. To make that backwards compatible with HTML 4, we need to
+  // comment out the CDATA-tag.
+  $embed_prefix = "\n<!--/*--><![CDATA[/*><!--*/\n";
+  $embed_suffix = "\n/*]]>*/-->\n";
+
   // Defaults for LINK and STYLE elements.
   $link_element_defaults = array(
     '#type' => 'html_tag',
@@ -3074,6 +3080,8 @@ function drupal_pre_render_styles($eleme
         if (isset($group['data'])) {
           $element = $style_element_defaults;
           $element['#value'] = $group['data'];
+          $element['#value_prefix'] = $embed_prefix;
+          $element['#value_suffix'] = $embed_suffix;
           $element['#attributes']['media'] = $group['media'];
           $element['#browsers'] = $group['browsers'];
           $elements[] = $element;
@@ -3082,6 +3090,8 @@ function drupal_pre_render_styles($eleme
           foreach ($group['items'] as $item) {
             $element = $style_element_defaults;
             $element['#value'] = $item['data'];
+            $element['#value_prefix'] = $embed_prefix;
+            $element['#value_suffix'] = $embed_suffix;
             $element['#attributes']['media'] = $item['media'];
             $element['#browsers'] = $group['browsers'];
             $elements[] = $element;
Index: modules/simpletest/tests/common.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v
retrieving revision 1.105
diff -u -p -r1.105 common.test
--- modules/simpletest/tests/common.test	3 Mar 2010 08:40:25 -0000	1.105
+++ modules/simpletest/tests/common.test	5 Mar 2010 06:21:27 -0000
@@ -568,7 +568,7 @@ class CascadingStylesheetsTestCase exten
    */
   function testRenderInlinePreprocess() {
     $css = 'body { padding: 0px; }';
-    $css_preprocessed = '<style type="text/css" media="all">' . drupal_load_stylesheet_content($css, TRUE) . '</style>';
+    $css_preprocessed = '<style type="text/css" media="all">' . "\n<!--/*--><![CDATA[/*><!--*/\n" . drupal_load_stylesheet_content($css, TRUE) . "\n/*]]>*/-->\n" . '</style>';
     drupal_add_css($css, 'inline');
     $styles = drupal_get_css();
     $this->assertEqual(trim($styles), $css_preprocessed, t('Rendering preprocessed inline CSS adds it to the page.'));