git.tremily.us Git - portage.git/commit

author	Fabian Groffen <grobian@gentoo.org>
	Tue, 10 Jan 2012 17:33:16 +0000 (18:33 +0100)
committer	Fabian Groffen <grobian@gentoo.org>
	Tue, 10 Jan 2012 17:33:16 +0000 (18:33 +0100)
commit	4b881a4d55a20639caf2f89b2f9b7548446fd81e
tree	a604ebbd3fac69dc0fc982f8bfaa5b6e92a62d67	tree \| snapshot
parent	435e9c72e3e6f5f3596e75524c6f6892bb5e7ada	commit \| diff
parent	b7b0e36986a90311e671e23c8ad16e10bcbb860f	commit \| diff

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

Conflicts:
bin/ebuild.sh
bin/phase-functions.sh
pym/portage/util/__init__.py

Unnamed repository; edit this file 'description' to name the repository.

bin/ebuild.sh	diff1 \|	diff2 \|	blob \| history
bin/phase-functions.sh	diff1 \|	diff2 \|	blob \| history
bin/repoman	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/_config/special_env_vars.py	diff1 \|	diff2 \|	blob \| history
pym/portage/package/ebuild/doebuild.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/__init__.py	diff1 \|	diff2 \|	blob \| history
pym/portage/util/env_update.py	diff1 \|	diff2 \|	blob \| history