Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Tue, 30 Mar 2010 17:32:03 +0000 (19:32 +0200)
committerFabian Groffen <grobian@gentoo.org>
Tue, 30 Mar 2010 17:32:03 +0000 (19:32 +0200)
commit206edf61d4f0261a9f305f1e57657a37800d912b
treeb4ab1ce244d4dabd0715e53dff7f1eba15b56277
parent222b926a876fe3d17c984d2ef657b64e303e05f2
parent59d910bceb96d1c68687f3a10dbb5147063e6b02
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/_emerge/Package.py
pym/portage/dbapi/bintree.py

EPREFIX var caused trouble in the various lists that DEFINED_PHASES is
now added to too.
pym/_emerge/Package.py
pym/portage/dbapi/bintree.py
pym/portage/dbapi/vartree.py