Merge remote branch 'overlays-gentoo-org/master' into prefix

author Fabian Groffen <grobian@gentoo.org>

Sun, 5 Sep 2010 07:51:51 +0000 (09:51 +0200)

committer Fabian Groffen <grobian@gentoo.org>

Sun, 5 Sep 2010 07:51:51 +0000 (09:51 +0200)
author Fabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 07:51:51 +0000 (09:51 +0200)
committer Fabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 07:51:51 +0000 (09:51 +0200)
diff --cc bin/ebuild.sh
Simple merge
diff --cc bin/emaint
Simple merge
diff --cc pym/_emerge/actions.py
Simple merge
diff --cc pym/portage/_sets/files.py
Simple merge
author	Fabian Groffen <grobian@gentoo.org>
	Sun, 5 Sep 2010 07:51:51 +0000 (09:51 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Sun, 5 Sep 2010 07:51:51 +0000 (09:51 +0200)
		1	2
bin/ebuild.sh	patch \|	diff1 \|	diff2 \|	blob \| history
bin/emaint	patch \|	diff1 \|	diff2 \|	blob \| history
pym/_emerge/actions.py	patch \|	diff1 \|	diff2 \|	blob \| history
pym/portage/_sets/files.py	patch \|	diff1 \|	diff2 \|	blob \| history