Index: trunk/wp-includes/feed.php
===================================================================
--- trunk/wp-includes/feed.php	(revision 7587)
+++ trunk/wp-includes/feed.php	(working copy)
@@ -48,6 +48,7 @@
 	} elseif ( 0 == $encode_html ) {
 		$content = make_url_footnote($content);
 	} elseif ( 2 == $encode_html ) {
+	    $content = preg_replace('|//\s*<!\[CDATA\[|', '<![CDATA[', $content);
 		$content = strip_tags($content);
 	}
 	if ( $cut ) {
Index: trunk/wp-includes/formatting.php
===================================================================
--- trunk/wp-includes/formatting.php	(revision 7587)
+++ trunk/wp-includes/formatting.php	(working copy)
@@ -831,6 +832,7 @@
 		$text = get_the_content('');
 		$text = apply_filters('the_content', $text);
 		$text = str_replace(']]>', ']]&gt;', $text);
+		$text = preg_replace('|//\s*<!\[CDATA\[|', '<![CDATA[', $text);
 		$text = strip_tags($text);
 		$excerpt_length = 55;
 		$words = explode(' ', $text, $excerpt_length + 1);
Index: trunk/wp-includes/post-template.php
===================================================================
--- trunk/wp-includes/post-template.php	(revision 7587)
+++ trunk/wp-includes/post-template.php	(working copy)
@@ -77,7 +77,8 @@
 function the_content($more_link_text = '(more...)', $stripteaser = 0, $more_file = '') {
 	$content = get_the_content($more_link_text, $stripteaser, $more_file);
 	$content = apply_filters('the_content', $content);
-	$content = str_replace(']]>', ']]&gt;', $content);
+	if (is_feed())
+		$content = str_replace(']]>', ']]&gt;', $content);
 	echo $content;
 }