Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 2 May 2011 17:38:24 +0000 (19:38 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 2 May 2011 17:38:24 +0000 (19:38 +0200)
commit6a851bcab5cab34dba3a1d89ce603480989e02a1
treecbaf137b6f407958d41277b482c5e8afa06bfacd
parentbe225af8d9aeb6a839f8ff231cbee61d3be45e0f
parent64cb7424256c47b1740a86580f41c0c535e036a3
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/misc-functions.sh
pym/portage/package/ebuild/doebuild.py
runtests.sh
13 files changed:
bin/ebuild.sh
bin/isolated-functions.sh
bin/misc-functions.sh
bin/repoman
man/emerge.1
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/emergelog.py
pym/_emerge/main.py
pym/portage/dbapi/bintree.py
pym/portage/package/ebuild/doebuild.py
runtests.sh