Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 12 Aug 2012 07:49:56 +0000 (09:49 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sun, 12 Aug 2012 07:49:56 +0000 (09:49 +0200)
commit20e5636d6a423452434ede1819e120133a9229ed
tree4299cd43741f652623ad7f021f399cfeeb42253b
parent909779359b10c327ccf0e79a3ee6703330901e74
parent7d8a1347efcf7b6800c8a9ec765cc87c7b299fda
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/chpathtool.py
bin/repoman
13 files changed:
bin/chpathtool.py
bin/ebuild-helpers/prepstrip
bin/emaint
bin/repoman
cnf/make.conf
cnf/make.globals
man/make.conf.5
pym/_emerge/main.py
pym/portage/const.py
pym/portage/dbapi/bintree.py
pym/portage/dbapi/vartree.py
pym/portage/output.py
pym/portage/package/ebuild/doebuild.py