Index: bin/emerge
===================================================================
--- bin/emerge	(revision 8314)
+++ bin/emerge	(working copy)
@@ -2330,7 +2330,7 @@
 					break
 		ignore_priority_soft_range = [None]
 		ignore_priority_soft_range.extend(
-			xrange(DepPriority.MIN, DepPriority.SOFT + 1))
+			xrange(DepPriority.MIN, DepPriority.MEDIUM_SOFT + 1))
 		tree_mode = "--tree" in self.myopts
 		# Tracks whether or not the current iteration should prefer asap_nodes
 		# if available.  This is set to False when the previous iteration
@@ -2359,6 +2359,7 @@
 
 		while not mygraph.empty():
 			selected_nodes = None
+			ignore_priority = None
 			if prefer_asap and asap_nodes:
 				"""ASAP nodes are merged before their soft deps."""
 				asap_nodes = [node for node in asap_nodes \
@@ -2450,25 +2452,23 @@
 						accept_root_node = True
 						continue
 
-					if selected_nodes and ignore_priority > DepPriority.SOFT:
-						# Try to merge ignored medium deps as soon as possible.
-						for node in selected_nodes:
-							children = set(mygraph.child_nodes(node))
-							soft = children.difference(
-								mygraph.child_nodes(node,
-								ignore_priority=DepPriority.SOFT))
-							medium_soft = children.difference(
-								mygraph.child_nodes(node,
-								ignore_priority=DepPriority.MEDIUM_SOFT))
-							medium_soft.difference_update(soft)
-							for child in medium_soft:
-								if child in selected_nodes:
-									continue
-								if child in asap_nodes:
-									continue
-								# TODO: Try harder to make these nodes get
-								# merged absolutely as soon as possible.
-								asap_nodes.append(child)
+			if selected_nodes and ignore_priority > DepPriority.SOFT:
+				# Try to merge ignored medium deps as soon as possible.
+				for node in selected_nodes:
+					children = set(mygraph.child_nodes(node))
+					soft = children.difference(
+						mygraph.child_nodes(node,
+						ignore_priority=DepPriority.SOFT))
+					medium_soft = children.difference(
+						mygraph.child_nodes(node,
+						ignore_priority=DepPriority.MEDIUM_SOFT))
+					medium_soft.difference_update(soft)
+					for child in medium_soft:
+						if child in selected_nodes:
+							continue
+						if child in asap_nodes:
+							continue
+						asap_nodes.append(child)
 
 			if not selected_nodes:
 				if not myblockers.is_empty():