Index: wp-admin/includes/theme.php
===================================================================
--- wp-admin/includes/theme.php	(revision 10051)
+++ wp-admin/includes/theme.php	(working copy)
@@ -63,12 +63,12 @@
 			$template_data = implode( '', file( WP_CONTENT_DIR.$template ));
 
 			$name = '';
-			if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) )
-				$name = $name[1];
+			if ( preg_match( '|Template Name:(.*)|mi', $template_data, $name ) )
+				$name = preg_replace('!\s*(\*/|\?>).+$!', '', $name[1]);
 
 			$description = '';
 			if( preg_match( '|Description:(.*)$|mi', $template_data, $description ) )
-				$description = $description[1];
+				$description  = preg_replace('!\s*(\*/|\?>).+$!', '', $description[1]);
 
 			if ( !empty( $name ) ) {
 				$page_templates[trim( $name )] = basename( $template );