Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Wed, 14 Sep 2011 18:38:02 +0000 (20:38 +0200)
committerFabian Groffen <grobian@gentoo.org>
Wed, 14 Sep 2011 18:38:02 +0000 (20:38 +0200)
1  2 
bin/ebuild
bin/repoman

diff --cc bin/ebuild
Simple merge
diff --cc bin/repoman
Simple merge