Merge slot conflict backtracking from master.
authorZac Medico <zmedico@gentoo.org>
Thu, 7 Oct 2010 00:20:09 +0000 (17:20 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 7 Oct 2010 00:20:09 +0000 (17:20 -0700)
commit94fc9aa76ba458798b7405f4ce8813a49046380e
treed1109b5763adb64e35741493b2733c904b17c72b
parentada0dbfd43d896dd09570261aa5c62a2cb0021c0
Merge slot conflict backtracking from master.

This include the ability to mask packages that don't satisfy all
parent atoms, from commit 9ff5e9731142d389373ea6ebc949919c3b637110.
pym/_emerge/depgraph.py