Index: wp-includes/nav-menu-template.php
===================================================================
--- wp-includes/nav-menu-template.php	(revision 24736)
+++ wp-includes/nav-menu-template.php	(working copy)
@@ -456,6 +456,9 @@
 			$classes[] = empty( $queried_object->taxonomy ) ? 'current-' . $queried_object->post_type . '-ancestor' : 'current-' . $queried_object->taxonomy . '-ancestor';
 		}
 
+		if ( $queried_object->post_parent == $parent_item->object_id ) {
+			$classes[] = 'current-' . $queried_object->post_type . '-parent';
+		}
 		if ( in_array(  intval( $parent_item->db_id ), $active_ancestor_item_ids ) ) {
 			$classes[] = 'current-menu-ancestor';
 			$menu_items[$key]->current_item_ancestor = true;
@@ -469,9 +472,9 @@
 
 		if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
 			// Back compat classes for pages to match wp_page_menu()
-			if ( in_array('current-menu-parent', $classes) )
+			if ( in_array('current-page-parent', $classes) )
 				$classes[] = 'current_page_parent';
-			if ( in_array('current-menu-ancestor', $classes) )
+			if ( in_array('current-page-ancestor', $classes) )
 				$classes[] = 'current_page_ancestor';
 		}