Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 12498)
+++ wp-settings.php	(working copy)
@@ -713,7 +713,7 @@
 // Load functions for active theme.
 if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . '/functions.php') )
 	include(STYLESHEETPATH . '/functions.php');
-if ( file_exists(TEMPLATEPATH . '/functions.php') )
+if ( !file_exists(STYLESHEETPATH . '/functions.php') && file_exists(TEMPLATEPATH . '/functions.php') )
 	include(TEMPLATEPATH . '/functions.php');
 
 // Load in support for template functions which the theme supports