Index: wp-includes/template.php
===================================================================
--- wp-includes/template.php	(revision 23294)
+++ wp-includes/template.php	(working copy)
@@ -219,7 +219,7 @@
 function get_front_page_template() {
 	$templates = array('front-page.php');
 
-	return get_query_template( 'front_page', $templates );
+	return get_query_template( 'front-page', $templates );
 }
 
 /**