- Forward port from trunk: Don't send HTML-only headers for icons (2nd try) - Consolidate HTML header code - Set no-cache headers - Don't set HTML headers for redirects