Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 26 Feb 2011 21:13:21 +0000 (22:13 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sat, 26 Feb 2011 21:13:21 +0000 (22:13 +0100)
commit2c30998a168fbb2f0ebca7d5e409be000793e816
tree45e1e3278f3e4c15d38630678dfa2c97444bfa93
parent739af37a0a13a10e5a41a426aad00bbed3bf8ca7
parentecf680f55beff84b2a69253a416f4afedf1a658e
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/4/dodoc
bin/ebuild-helpers/doins
bin/ebuild.sh
bin/isolated-functions.sh
bin/misc-functions.sh
15 files changed:
bin/ebuild-helpers/dodoc
bin/ebuild-helpers/doins
bin/ebuild.sh
bin/egencache
bin/isolated-functions.sh
bin/misc-functions.sh
bin/repoman
man/emerge.1
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/dbapi/bintree.py
pym/portage/dbapi/vartree.py
pym/portage/getbinpkg.py
runtests.sh