Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 6 May 2010 19:56:17 +0000 (21:56 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 6 May 2010 19:56:17 +0000 (21:56 +0200)
1  2 
bin/ebuild.sh
pym/_emerge/depgraph.py
pym/portage/dbapi/vartree.py

diff --cc bin/ebuild.sh
Simple merge
Simple merge
Simple merge