Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 19 Dec 2011 18:29:38 +0000 (19:29 +0100)
committerFabian Groffen <grobian@gentoo.org>
Mon, 19 Dec 2011 18:29:38 +0000 (19:29 +0100)
commit45f8d30649d45064e1d7c67eb4b567f5ac690a2f
treedbf136384de0f28d8ded1259d89c86a6860dbd25
parentf81adbe69b1fb4e01bf1cd4470b143f098204fc7
parent2ea565e1af3416ab5743c4b7181476d9a6734123
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/portage/data.py
12 files changed:
bin/ebuild.sh
bin/isolated-functions.sh
bin/phase-functions.sh
man/emerge.1
man/make.conf.5
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/__init__.py
pym/portage/data.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/util/_pty.py