Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 3 Sep 2010 15:37:28 +0000 (17:37 +0200)
committerFabian Groffen <grobian@gentoo.org>
Fri, 3 Sep 2010 15:37:28 +0000 (17:37 +0200)
commit0385b326c6a1d9316edfd66bd2f6b4b3e8cc43b3
treea49f9f3646d897d496d4d9e0015a0936a3303eed
parentef8db3ce02f40d1cb2e972530633893e13e535cc
parentd776c545e620c25da8e034b3f2c69145fcc3d617
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild.sh
pym/portage/package/ebuild/config.py
bin/ebuild
bin/ebuild.sh
bin/isolated-functions.sh
pym/_emerge/main.py
pym/portage/const.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/config.py