Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 23 Dec 2011 09:44:26 +0000 (10:44 +0100)
committerFabian Groffen <grobian@gentoo.org>
Fri, 23 Dec 2011 09:44:26 +0000 (10:44 +0100)
commitd32995adfc27f2a5bd4d85f951c3e828dc867600
tree3a8eec5729414785761bf5617f855880c5c5df6f
parent9dee9d50c541da4f5282ce6624d82be64bb88a37
parent3bbbe6b190079e943bbfda598f9dd0d45661c0e0
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/newbin
bin/ebuild-helpers/newconfd
bin/ebuild-helpers/newdoc
bin/ebuild-helpers/newenvd
bin/ebuild-helpers/newexe
bin/ebuild-helpers/newinitd
bin/ebuild-helpers/newlib.a
bin/ebuild-helpers/newlib.so
bin/ebuild-helpers/newman
bin/ebuild-helpers/newsbin
pym/portage/util/_pty.py
18 files changed:
bin/ebuild-helpers/newbin
bin/ebuild-helpers/newconfd
bin/ebuild-helpers/newdoc
bin/ebuild-helpers/newenvd
bin/ebuild-helpers/newexe
bin/ebuild-helpers/newinitd
bin/ebuild-helpers/newins
bin/ebuild-helpers/newlib.a
bin/ebuild-helpers/newlib.so
bin/ebuild-helpers/newman
bin/ebuild-helpers/newsbin
bin/ebuild.sh
bin/misc-functions.sh
bin/phase-functions.sh
man/make.conf.5
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/fetch.py