Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 12566)
+++ wp-settings.php	(working copy)
@@ -18,9 +18,6 @@
 set_magic_quotes_runtime(0);
 @ini_set('magic_quotes_sybase', 0);
 
-if ( function_exists('date_default_timezone_set') )
-	date_default_timezone_set('UTC');
-
 /**
  * Turn register globals off.
  *
@@ -719,6 +716,14 @@
 // Load in support for template functions which the theme supports
 require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
 
+// Set the timezone
+if ( function_exists('date_default_timezone_set') ) {
+	if ( $timezone_string = get_option( 'timezone_string' ) )
+		@date_default_timezone_set( $timezone_string );
+	else
+		@date_default_timezone_set(ini_get('date.timezone') ? ini_get('date.timezone') : 'UTC');
+}
+
 /**
  * Runs just before PHP shuts down execution.
  *