Index: readme.html
===================================================================
--- readme.html	(revision 6528)
+++ readme.html	(working copy)
@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>WordPress &rsaquo; ReadMe</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="stylesheet" href="wp-admin/css/install.css" type="text/css" />
 </head>
 <body>
Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 6528)
+++ wp-admin/setup-config.php	(working copy)
@@ -28,8 +28,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>WordPress &rsaquo; Setup Configuration File</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <style media="screen" type="text/css">
 	<!--
 	html {
Index: wp-admin/sidebar.php
===================================================================
--- wp-admin/sidebar.php	(revision 6528)
+++ wp-admin/sidebar.php	(working copy)
@@ -26,8 +26,8 @@
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('blog_charset'); ?>" />
 <title>WordPress &#8250; Sidebar</title>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('blog_charset'); ?>" />
 <?php wp_admin_css(); ?>
 <style type="text/css" media="screen">
 form {
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 6528)
+++ wp-includes/functions.php	(working copy)
@@ -1261,8 +1261,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists('language_attributes') ) language_attributes(); ?>>
 <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title><?php echo $title ?></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="stylesheet" href="<?php echo $admin_dir; ?>css/install.css" type="text/css" />
 <?php
 if ( ( $wp_locale ) && ('rtl' == $wp_locale->text_direction) ) : ?>
@@ -1440,8 +1440,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>>
 <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>Database Error</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head>
 <body>
 	<h1>Error establishing a database connection</h1>
Index: wp-includes/js/tinymce/blank.htm
===================================================================
--- wp-includes/js/tinymce/blank.htm	(revision 6528)
+++ wp-includes/js/tinymce/blank.htm	(working copy)
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>blank_page</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body class="mceContentBody">
 
Index: wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
===================================================================
--- wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js	(revision 6528)
+++ wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js	(working copy)
@@ -397,12 +397,12 @@
 	html += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
 	html += '<html>';
 	html += '<head>';
+	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
 	html += '<title>Wrapper iframe</title>';
 	
 	// WordPress: put the window buttons on the left as in Macs
 	if (this.isMac) html += '<style type="text/css">.mceWindowTitle{float:none;margin:0;width:100%;text-align:center;}.mceWindowClose{float:none;position:absolute;left:0px;top:0px;}</style>';
 	
-	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
 	html += '<link href="' + this.getParam("css_file") + '" rel="stylesheet" type="text/css" />';
 	html += '</head>';
 	html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
Index: wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js
===================================================================
--- wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js	(revision 6528)
+++ wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js	(working copy)
@@ -167,8 +167,8 @@
 	html += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
 	html += '<html>';
 	html += '<head>';
+	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
 	html += '<title>Wrapper iframe</title>';
-	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
 	html += '<link href="../jscripts/tiny_mce/themes/advanced/css/editor_ui.css" rel="stylesheet" type="text/css" />';
 	html += '</head>';
 	html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
Index: wp-includes/js/tinymce/plugins/paste/blank.htm
===================================================================
--- wp-includes/js/tinymce/plugins/paste/blank.htm	(revision 6528)
+++ wp-includes/js/tinymce/plugins/paste/blank.htm	(working copy)
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>blank_page</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<script language="javascript">
 		function init() {
 			document.body.contentEditable = true;
Index: wp-includes/js/tinymce/tiny_mce.js
===================================================================
--- wp-includes/js/tinymce/tiny_mce.js	(revision 6528)
+++ wp-includes/js/tinymce/tiny_mce.js	(working copy)
@@ -3875,7 +3875,7 @@
 		// Setup base HTML
 		doc = this.contentDocument;
 		if (dynamicIFrame) {
-			html = tinyMCE.getParam('doctype') + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + tinyMCE.settings.base_href + '" /><title>blank_page</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body class="mceContentBody"></body></html>';
+			html = tinyMCE.getParam('doctype') + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + tinyMCE.settings.base_href + '" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>blank_page</title></head><body class="mceContentBody"></body></html>';
 
 			try {
 				if (!this.isHidden())

