Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Wed, 12 Sep 2012 18:17:49 +0000 (20:17 +0200)
committerFabian Groffen <grobian@gentoo.org>
Wed, 12 Sep 2012 18:17:49 +0000 (20:17 +0200)
commitf0397094c2ed8fe67b96cbc797da99aaac335cca
tree6506923a92eb89dfca26333e511af46199aee614
parentf344fbaaad0b6f976ad9b404ea46cc518f2c9f5e
parent98a5c7ae69499cc94a1d362aafb9bb2c1eb20ee8
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/portage/data.py
15 files changed:
bin/egencache
bin/phase-functions.sh
bin/phase-helpers.sh
bin/repoman
bin/save-ebuild-env.sh
cnf/make.conf
man/emerge.1
man/make.conf.5
pym/_emerge/depgraph.py
pym/portage/__init__.py
pym/portage/const.py
pym/portage/data.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/util/__init__.py