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

author Fabian Groffen <grobian@gentoo.org>

Tue, 3 Apr 2012 18:04:09 +0000 (20:04 +0200)

committer Fabian Groffen <grobian@gentoo.org>

Tue, 3 Apr 2012 18:04:09 +0000 (20:04 +0200)
author Fabian Groffen <grobian@gentoo.org>
Tue, 3 Apr 2012 18:04:09 +0000 (20:04 +0200)
committer Fabian Groffen <grobian@gentoo.org>
Tue, 3 Apr 2012 18:04:09 +0000 (20:04 +0200)
diff --cc bin/repoman
Simple merge
diff --cc pym/portage/dispatch_conf.py
Simple merge
diff --cc pym/portage/package/ebuild/config.py
Simple merge
diff --cc pym/portage/package/ebuild/doebuild.py
Simple merge
diff --cc pym/portage/util/__init__.py
Simple merge
author	Fabian Groffen <grobian@gentoo.org>
	Tue, 3 Apr 2012 18:04:09 +0000 (20:04 +0200)
committer	Fabian Groffen <grobian@gentoo.org>
	Tue, 3 Apr 2012 18:04:09 +0000 (20:04 +0200)
		1	2
bin/repoman	patch \|	diff1 \|	diff2 \|	blob \| history
pym/portage/dispatch_conf.py	patch \|	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/doebuild.py	patch \|	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history