Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 18 Sep 2010 10:02:21 +0000 (12:02 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sat, 18 Sep 2010 10:02:21 +0000 (12:02 +0200)
commitfc2b4a942ebb42cd924fe7c8600dab37890ccde7
tree33769a023cc1a9e6b41808f0db2503cfbc1f2903
parentefdd1e5d2a391f56b06d68cf6717b20c669d30ea
parent33e225f07b92786428f20fc5d40cd09364dfc4a5
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild.sh
bin/ebuild.sh
bin/isolated-functions.sh
bin/repoman
man/emerge.1
pym/_emerge/depgraph.py
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/doebuild.py
pym/portage/util/__init__.py