Index: nav-menu.php
===================================================================
--- nav-menu.php	(revision 26908)
+++ nav-menu.php	(working copy)
@@ -702,7 +702,7 @@
 	);
 	foreach( (array) $menu_items as $menu_item ) {
 		if ( isset( $menu_item->ID ) && is_nav_menu_item( $menu_item->ID ) ) {
-			if ( get_post_meta( $menu_item->ID, '_menu_item_type', true ) !== $object_type ||
+			if ( get_post_meta( $menu_item->ID, '_menu_item_type', true ) !== $object_type &&
 				get_post_meta( $menu_item->ID, '_menu_item_object', true ) !== $taxonomy )
 				continue;