Index: wp-content/themes/twentyten/archive.php
===================================================================
--- wp-content/themes/twentyten/archive.php	(revision 13141)
+++ wp-content/themes/twentyten/archive.php	(working copy)
@@ -17,7 +17,7 @@
 
 <?php rewind_posts(); ?>
 
-<?php include 'loop.php'; ?>
+<?php get_loop('excerpt'); ?>
 
 			</div><!-- #content -->
 		</div><!-- #container -->
Index: wp-content/themes/twentyten/author.php
===================================================================
--- wp-content/themes/twentyten/author.php	(revision 13141)
+++ wp-content/themes/twentyten/author.php	(working copy)
@@ -21,7 +21,7 @@
 
 <?php rewind_posts(); ?>
 
-<?php include 'loop.php'; ?>
+<?php get_loop('excerpt'); ?>
 
 			</div><!-- #content -->
 		</div><!-- #container -->
Index: wp-content/themes/twentyten/category.php
===================================================================
--- wp-content/themes/twentyten/category.php	(revision 13141)
+++ wp-content/themes/twentyten/category.php	(working copy)
@@ -10,7 +10,7 @@
 
 <?php rewind_posts(); ?>
 
-<?php include 'loop.php'; ?>
+<?php get_loop('excerpt'); ?>
 
 			</div><!-- #content -->
 		</div><!-- #container -->
Index: wp-content/themes/twentyten/index.php
===================================================================
--- wp-content/themes/twentyten/index.php	(revision 13141)
+++ wp-content/themes/twentyten/index.php	(working copy)
@@ -4,7 +4,7 @@
 			<div id="content">
 
     <?php if ( have_posts() ) : 
-		include 'loop.php';
+		get_loop();
     else : ?>
 		<h2><?php _e( 'Not Found', 'twentyten' ); ?></h2>
 		<div class="entry-content">
Index: wp-content/themes/twentyten/loop.php
===================================================================
--- wp-content/themes/twentyten/loop.php	(revision 13141)
+++ wp-content/themes/twentyten/loop.php	(working copy)
@@ -14,7 +14,7 @@
 			<span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
 			<a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
 			<span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
-			<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+			<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
 		</div><!-- .entry-meta -->
 
 		<div class="entry-content">
@@ -46,15 +46,21 @@
 
 <?php } elseif ( in_category( 'asides' ) ) { ?>
 	<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+<?php if ( is_named_loop('excerpt') ) : ?>
+		<div class="entry-summary">
+			<?php the_excerpt( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+		</div><!-- .entry-summary -->
+<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
 		</div><!-- .entry-content -->
+<?php endif; ?>
 
 		<div class="entry-utility">
 			<span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
 			<a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
 			<span class="meta-sep"> <?php _e( ' by ', 'twentyten' ); ?> </span>
-			<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+			<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
 			<span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
 			<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
 			<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
@@ -71,12 +77,12 @@
 			<a href="<?php
 the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
 			<span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
-			<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+			<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
 		</div><!-- .entry-meta -->
 
-<?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
+<?php if ( is_named_loop('excerpt') ) : ?>
 		<div class="entry-summary">
-			<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+			<?php the_excerpt( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
 		</div><!-- .entry-summary -->
 <?php else : ?>
 		<div class="entry-content">
Index: wp-content/themes/twentyten/search.php
===================================================================
--- wp-content/themes/twentyten/search.php	(revision 13141)
+++ wp-content/themes/twentyten/search.php	(working copy)
@@ -5,7 +5,7 @@
 
 <?php if ( have_posts() ) : ?>
 				<h1 class="page-title"><?php _e( 'Search Results for: ', 'twentyten' ); ?><span><?php the_search_query(); ?></span></h1>
-	<?php include 'loop.php'; ?>
+	<?php get_loop('excerpt'); ?>
 <?php else : ?>
 				<div id="post-0" class="post no-results not-found">
 					<h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ); ?></h2>
Index: wp-content/themes/twentyten/single.php
===================================================================
--- wp-content/themes/twentyten/single.php	(revision 13139)
+++ wp-content/themes/twentyten/single.php	(working copy)
@@ -15,7 +15,7 @@
 
 					<div class="entry-meta">
 						<span class="meta-prep meta-prep-author"><?php _e( 'Posted by ', 'twentyten' ); ?></span>
-						<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+						<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
 						<span class="meta-sep"><?php _e( ' on ', 'twentyten' ); ?> </span>
 						<a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ); ?>
@@ -35,7 +35,7 @@
 							<h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
 							<?php the_author_meta('description'); ?>
 							<div id="author-link">
-								<a href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php _e( 'View all posts by ', 'twentyten' ); ?><?php the_author(); ?> &rarr;</a>
+								<a href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php _e( 'View all posts by ', 'twentyten' ); ?><?php the_author(); ?> &rarr;</a>
 							</div><!-- #author-link	-->
 						</div><!-- #author-description	-->
 					</div><!-- .entry-author-info -->
Index: wp-content/themes/twentyten/tag.php
===================================================================
--- wp-content/themes/twentyten/tag.php	(revision 13141)
+++ wp-content/themes/twentyten/tag.php	(working copy)
@@ -9,7 +9,7 @@
 
 <?php rewind_posts(); ?>
 
-<?php include 'loop.php'; ?>
+<?php get_loop('excerpt'); ?>
 
 			</div><!-- #content -->
 		</div><!-- #container -->
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 13143)
+++ wp-includes/general-template.php	(working copy)
@@ -94,6 +94,55 @@
 }
 
 /**
+ * Load loop template.
+ *
+ * Includes the loop template for a theme or if a name is specified then a
+ * specialised loop will be included.
+ *
+ * For the parameter, if the file is called "loop-special.php" then specify
+ * "special".
+ *
+ * @uses locate_template()
+ * @global $_template_loop
+ * @since 3.0
+ * @uses do_action() Calls 'get_loop' action.
+ *
+ * @param string $name (optional) The name of the specialised loop.
+ */
+function get_loop( $name = null ) {
+	global $_template_loop;
+	$_template_loop = $name;
+	do_action( 'get_loop', $name );
+
+	$templates = array();
+	if ( isset($name) )
+		$templates[] = "loop-{$name}.php";
+
+	$templates[] = "loop.php";
+
+	$templates = apply_filters('get_loop_templates', $templates, $name);
+
+	return locate_template($templates, true);
+}
+
+/**
+ * Check to see if Current Loop is a named loop
+ *
+ * For the parameter, if the file is called "loop-special.php" then specify
+ * "special".
+ *
+ * @global $_template_loop
+ * @since 3.0
+ *
+ * @param string $name (optional) The name of the specialised loop.
+ * @return bool If its that named loop or not.
+ */
+function is_named_loop($name = null) {
+	global $_template_loop;
+	return ($_template_loop == $name);
+}
+
+/**
  * Display search form.
  *
  * Will first attempt to locate the searchform.php file in either the child or