Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 3 Apr 2010 09:33:50 +0000 (11:33 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sat, 3 Apr 2010 09:33:50 +0000 (11:33 +0200)
1  2 
bin/egencache
pym/portage/const.py
pym/portage/package/ebuild/doebuild.py

diff --cc bin/egencache
Simple merge
Simple merge