Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 13 Oct 2011 06:50:59 +0000 (08:50 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 13 Oct 2011 06:50:59 +0000 (08:50 +0200)
commitaa61149212569507c6c98aaf8be71ac86747bb08
tree58a37fff735f67d18b2bed3d1fa8df891f81671d
parentf7190575cf1dd3698d0cce1bbf8c071e4fedbbc3
parentdf6c9363bec1a7706b53ef1c6aa760bb45ccad4a
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/prepstrip
22 files changed:
bin/archive-conf
bin/dispatch-conf
bin/ebuild
bin/ebuild-helpers/prepstrip
bin/etc-update
bin/portageq
bin/repoman
cnf/dispatch-conf.conf
cnf/make.globals
man/emerge.1
man/make.conf.5
pym/_emerge/EbuildBuild.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/const.py
pym/portage/dbapi/vartree.py
pym/portage/output.py
pym/portage/package/ebuild/_config/MaskManager.py
pym/portage/package/ebuild/doebuild.py
pym/portage/package/ebuild/fetch.py
pym/portage/tests/runTests
runtests.sh