Index: branches/2.6/wp-includes/general-template.php
===================================================================
--- branches/2.6/wp-includes/general-template.php	(revision 8653)
+++ branches/2.6/wp-includes/general-template.php	(working copy)
@@ -2,18 +2,22 @@
 
 /* Note: these tags go anywhere in the template */
 
-function get_header() {
+function get_header( $name = null ) {
 	do_action( 'get_header' );
-	if ( file_exists( TEMPLATEPATH . '/header.php') )
+	if ( isset($name) && file_exists( TEMPLATEPATH . "/header-{$name}.php") )
+		load_template( TEMPLATEPATH . "/header-{$name}.php");
+	elseif ( file_exists( TEMPLATEPATH . '/header.php') )
 		load_template( TEMPLATEPATH . '/header.php');
 	else
 		load_template( WP_CONTENT_DIR . '/themes/default/header.php');
 }
 
 
-function get_footer() {
+function get_footer( $name = null ) {
 	do_action( 'get_footer' );
-	if ( file_exists( TEMPLATEPATH . '/footer.php') )
+	if ( isset($name) && file_exists( TEMPLATEPATH . "/footer-{$name}.php") )
+		load_template( TEMPLATEPATH . "/footer-{$name}.php");
+	elseif ( file_exists( TEMPLATEPATH . '/footer.php') )
 		load_template( TEMPLATEPATH . '/footer.php');
 	else
 		load_template( WP_CONTENT_DIR . '/themes/default/footer.php');
@@ -365,7 +369,7 @@
 		$link_html = "\t$before<a href='$url' title='$title_text'>$text</a>$after\n";
 
 	$link_html = apply_filters( "get_archives_link", $link_html );
-		
+
 	return $link_html;
 }
 
@@ -1189,10 +1193,10 @@
 }
 
 /**
- * Enqueues the default ThickBox js and css. 
+ * Enqueues the default ThickBox js and css.
  * If any of the settings need to be changed, this can be done with another js file
  * similar to media-upload.js and theme-preview.js. That file should require array('thickbox')
- * to ensure it is loaded after. 
+ * to ensure it is loaded after.
  */
 function add_thickbox() {
 	wp_enqueue_script( 'thickbox' );