Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 22 Dec 2011 09:47:11 +0000 (10:47 +0100)
committerFabian Groffen <grobian@gentoo.org>
Thu, 22 Dec 2011 09:47:11 +0000 (10:47 +0100)
commit80319ff9c03b94303c4df153dc1f1de7462e5542
tree8229b6f65aad2c3bb3e45a721af083d06114d6c9
parent45f8d30649d45064e1d7c67eb4b567f5ac690a2f
parentc3a50a9a2c8116c95c8b2f89d570a89c299ddea3
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/prepstrip
pym/portage/data.py
12 files changed:
bin/ebuild-helpers/prepstrip
bin/misc-functions.sh
bin/phase-functions.sh
cnf/make.conf
cnf/make.globals
man/emerge.1
man/make.conf.5
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/data.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/doebuild.py