Index: /trunk/wp-admin/admin.php
===================================================================
--- /trunk/wp-admin/admin.php	(revision 1982)
+++ /trunk/wp-admin/admin.php	(revision 1983)
@@ -5,4 +5,8 @@
 auth_redirect();
 
+header('Expires: Mon, 11 Jan 1984 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Cache-Control: no-cache, must-revalidate, max-age=0');
+header('Pragma: no-cache');
 
 $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories");
Index: /trunk/wp-comments-post.php
===================================================================
--- /trunk/wp-comments-post.php	(revision 1982)
+++ /trunk/wp-comments-post.php	(revision 1983)
@@ -39,5 +39,5 @@
 header('Expires: Mon, 11 Jan 1984 05:00:00 GMT');
 header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-header('Cache-Control: no-cache, must-revalidate');
+header('Cache-Control: no-cache, must-revalidate, max-age=0');
 header('Pragma: no-cache');
 
Index: /trunk/wp-includes/functions.php
===================================================================
--- /trunk/wp-includes/functions.php	(revision 1982)
+++ /trunk/wp-includes/functions.php	(revision 1983)
@@ -1561,8 +1561,8 @@
 	if ( (!empty($_COOKIE['wordpressuser_' . COOKIEHASH]) && 
 	!wp_login($_COOKIE['wordpressuser_' . COOKIEHASH], $_COOKIE['wordpresspass_' . COOKIEHASH], true)) ||
-	 (empty($_COOKIE['wordpressuser_' . COOKIEHASH])) ) {
-		header('Expires: Wed, 5 Jun 1979 23:41:00 GMT'); // Michel's birthday
+	(empty($_COOKIE['wordpressuser_' . COOKIEHASH])) ) {
+		header('Expires: Mon, 11 Jan 1984 05:00:00 GMT');
 		header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-		header('Cache-Control: no-cache, must-revalidate');
+		header('Cache-Control: no-cache, must-revalidate, max-age=0');
 		header('Pragma: no-cache');
 	
Index: /trunk/wp-login.php
===================================================================
--- /trunk/wp-login.php	(revision 1982)
+++ /trunk/wp-login.php	(revision 1983)
@@ -20,4 +20,8 @@
     setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
     setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
+	header('Expires: Mon, 11 Jan 1984 05:00:00 GMT');
+	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+	header('Cache-Control: no-cache, must-revalidate, max-age=0');
+	header('Pragma: no-cache');
 
 	header('Location: wp-login.php');