Index: typo3/sysext/cms/tslib/class.tslib_pagegen.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_pagegen.php	(Revision 5629)
+++ typo3/sysext/cms/tslib/class.tslib_pagegen.php	(Arbeitskopie)
@@ -456,7 +456,32 @@
 	<meta http-equiv="Content-Type" content="text/html; charset='.$theCharset.'" />';
 
 		$GLOBALS['TSFE']->content.='
+	<meta name="generator" content="TYPO3 '.TYPO3_branch.' CMS" />';
 
+			// Setting charset meta tags:
+		$conf=$GLOBALS['TSFE']->pSetup['meta.'];
+		if (is_array($conf))	{
+			foreach($conf as $theKey=>$theValue)	{
+				if (!strstr($theKey,'.') || !isset($conf[substr($theKey,0,-1)]))	{		// Only if 1) the property is set but not the value itself, 2) the value and/or any property
+					if (strstr($theKey,'.'))	{
+						$theKey = substr($theKey,0,-1);
+					}
+					$val = $GLOBALS['TSFE']->cObj->stdWrap($conf[$theKey],$conf[$theKey.'.']);
+					$key = $theKey;
+					if (trim($val))	{
+						$a='name';
+						if (strcmp($key,'refresh') || strcmp($key,'x-ua-compatible')) {
+							$a='http-equiv';
+						}
+						$GLOBALS['TSFE']->content.= '
+	<meta '.$a.'="'.$key.'" content="'.htmlspecialchars(trim($val)).'" />';
+					}
+				}
+			}
+		}
+
+		$GLOBALS['TSFE']->content.='
+
 <!-- '.($customContent?$customContent.chr(10):'').'
 	This website is powered by TYPO3 - inspiring people to share!
 	TYPO3 is a free open source Content Management Framework initially created by Kasper Skaarhoj and licensed under GNU/GPL.
@@ -671,29 +696,7 @@
 			$GLOBALS['TSFE']->content.='
 	<title>'.htmlspecialchars($titleTagContent).'</title>';
 		}
-		$GLOBALS['TSFE']->content.='
-	<meta name="generator" content="TYPO3 '.TYPO3_branch.' CMS" />';
 
-		$conf=$GLOBALS['TSFE']->pSetup['meta.'];
-		if (is_array($conf))	{
-			reset($conf);
-			while(list($theKey,$theValue)=each($conf))	{
-				if (!strstr($theKey,'.') || !isset($conf[substr($theKey,0,-1)]))	{		// Only if 1) the property is set but not the value itself, 2) the value and/or any property
-					if (strstr($theKey,'.'))	{
-						$theKey = substr($theKey,0,-1);
-					}
-					$val = $GLOBALS['TSFE']->cObj->stdWrap($conf[$theKey],$conf[$theKey.'.']);
-					$key = $theKey;
-					if (trim($val))	{
-						$a='name';
-						if (strtolower($key)=='refresh')	{$a='http-equiv';}
-						$GLOBALS['TSFE']->content.= '
-	<meta '.$a.'="'.$key.'" content="'.htmlspecialchars(trim($val)).'" />';
-					}
-				}
-			}
-		}
-
 		unset($GLOBALS['TSFE']->additionalHeaderData['JSCode']);
 		unset($GLOBALS['TSFE']->additionalHeaderData['JSImgCode']);