Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Wed, 2 Feb 2011 16:49:11 +0000 (17:49 +0100)
committerFabian Groffen <grobian@gentoo.org>
Wed, 2 Feb 2011 16:49:11 +0000 (17:49 +0100)
commitde976a11529d4810ed382eac7c6cdf963a848934
treeeb65e131fa09554c58ccf2d23299972d9f634d69
parent864684b7b0087d32b7f6881e63352163d4f80ff4
parent6709704ffe68937e35d6e945043b5da50b5941c2
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/_emerge/EbuildBuild.py
bin/isolated-functions.sh
pym/_emerge/EbuildBuild.py
pym/_emerge/Package.py
pym/_emerge/depgraph.py
pym/portage/package/ebuild/_config/MaskManager.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/package/ebuild/fetch.py
pym/portage/process.py