Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 10 Feb 2011 18:17:03 +0000 (19:17 +0100)
committerFabian Groffen <grobian@gentoo.org>
Thu, 10 Feb 2011 18:17:03 +0000 (19:17 +0100)
1  2 
bin/ebuild.sh
man/emerge.1
pym/_emerge/depgraph.py

diff --cc bin/ebuild.sh
Simple merge
diff --cc man/emerge.1
Simple merge
Simple merge