Index: /Users/peterwilson/Sites/int.pwcc.cc/wptrac/wp-includes/post-template.php
===================================================================
--- /Users/peterwilson/Sites/int.pwcc.cc/wptrac/wp-includes/post-template.php	(revision 18405)
+++ /Users/peterwilson/Sites/int.pwcc.cc/wptrac/wp-includes/post-template.php	(working copy)
@@ -486,9 +486,13 @@
 			$classes[] = 'page-child';
 			$classes[] = 'parent-pageid-' . $post->post_parent;
 		}
+		//page-template is added to all pages		
+		$classes[] = 'page-template';
 		if ( is_page_template() ) {
-			$classes[] = 'page-template';
 			$classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_post_meta( $page_id, '_wp_page_template', true ) ), '' );
+		} else {
+			//add page-template-default to pages without template
+			$classes[] = 'page-template-default';			
 		}
 	} elseif ( is_search() ) {
 		if ( !empty( $wp_query->posts ) )