Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 31 Mar 2012 19:30:59 +0000 (21:30 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sat, 31 Mar 2012 19:30:59 +0000 (21:30 +0200)
commit1fac28c57317b8174580b8243c3549fd75aeaa6d
tree44c9e996ec003c5b27fa603e8200109895f97a77
parent86fd28940bd83d1f59622adc90cf79712b061952
parent3f7a3b294dd38c6009d41ce7f40075e2e2645c6e
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/dosym
bin/ebuild-helpers/fowners
bin/etc-update
bin/repoman
pym/_emerge/main.py
23 files changed:
bin/dispatch-conf
bin/ebuild-helpers/dosym
bin/ebuild-helpers/fowners
bin/ebuild.sh
bin/emerge-webrsync
bin/etc-update
bin/isolated-functions.sh
bin/misc-functions.sh
bin/portageq
bin/repoman
pym/_emerge/EbuildBuild.py
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/dbapi/bintree.py
pym/portage/dbapi/vartree.py
pym/portage/dispatch_conf.py
pym/portage/output.py
pym/portage/package/ebuild/doebuild.py
pym/portage/process.py
pym/portage/util/__init__.py
pym/portage/util/_pty.py