Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Tue, 12 Oct 2010 18:21:12 +0000 (20:21 +0200)
committerFabian Groffen <grobian@gentoo.org>
Tue, 12 Oct 2010 18:21:12 +0000 (20:21 +0200)
commite1c84bb8511e75902aa5a8f56e840079d049965b
treed725f6f97abbd6bd7f7ab4c7e7622cf81d23d3f5
parent1e74e85d17c1dee6d031d6045079e6caac09cc51
parent13265b866e87e132ff6fb0726e3773f490a2b90c
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
cnf/make.conf
cnf/make.globals
mkrelease.sh
16 files changed:
bin/ebuild
bin/egencache
bin/misc-functions.sh
bin/portageq
bin/repoman
cnf/make.conf
cnf/make.globals
man/emerge.1
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/_config/MaskManager.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py