Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 19 Feb 2012 09:57:58 +0000 (10:57 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sun, 19 Feb 2012 09:57:58 +0000 (10:57 +0100)
commit5f0978d957aa3ad2a3e9806bde34947b167ae554
treead113cb26c89ffc25e1924fcb926d1e9dcda1447
parent12b07d61f9b7dc85a4d2bf3a0fa75f161be9dcab
parent9ed6365f4c6e65f5c38f23505fe704ac5f81feaa
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
runtests.sh
bin/repoman
pym/_emerge/EbuildBuild.py
pym/_emerge/EbuildBuildDir.py
pym/_emerge/depgraph.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/package/ebuild/fetch.py
pym/portage/process.py
runtests.sh