Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 10 Dec 2011 10:56:53 +0000 (11:56 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sat, 10 Dec 2011 10:56:53 +0000 (11:56 +0100)
commit28b58821c000fc413312cb44c85f6697a555625c
treea0acecf333e8c6b2f2478e302cb90a0194afaa18
parent9b1d50b7f5ba9dfa89d311bd1eca24439747a0c9
parent6081171d9920c6902aced768ce19af94ed3c7320
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/dispatch-conf
bin/egencache
bin/phase-functions.sh
bin/portageq
bin/repoman
cnf/make.globals
pym/_emerge/Binpkg.py
pym/portage/__init__.py
pym/portage/data.py
pym/portage/dispatch_conf.py
pym/portage/package/ebuild/_config/special_env_vars.py
15 files changed:
bin/dispatch-conf
bin/egencache
bin/phase-functions.sh
bin/portageq
bin/repoman
man/make.conf.5
pym/_emerge/Binpkg.py
pym/_emerge/main.py
pym/portage/__init__.py
pym/portage/const.py
pym/portage/data.py
pym/portage/dispatch_conf.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/config.py
pym/portage/util/env_update.py