Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 2 Jul 2010 16:56:39 +0000 (18:56 +0200)
committerFabian Groffen <grobian@gentoo.org>
Fri, 2 Jul 2010 16:56:39 +0000 (18:56 +0200)
commit66229e81112a43d1396afd5d4acdeadec6751697
treedebd1e368bbdce9225a6359020685eeffda5565d
parent5914c0578bbcc9aeaaf77209cc75af2c003f63be
parent3669b8463907ed927ff27f7bfc10c6fe4aebf770
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/_emerge/actions.py
bin/ebuild.sh
bin/egencache
bin/misc-functions.sh
bin/repoman
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/portage/dbapi/bintree.py
pym/portage/package/ebuild/config.py