Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 25 Aug 2011 20:22:02 +0000 (22:22 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 25 Aug 2011 20:22:02 +0000 (22:22 +0200)
commit253d0140bb34d02368162b5d5fd5b030ea96965d
treec4c41e0b56ab817a19e5e894a69bbae7d8028236
parent0b4156a55f460d501145936fe7d1dec022f5a5f9
parent5970a41fc60fef89fd4b1bbe45a6c108452b267f
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/dosym
bin/ebuild
bin/ebuild-helpers/dosym
bin/isolated-functions.sh
pym/portage/output.py
pym/portage/package/ebuild/doebuild.py
pym/portage/package/ebuild/prepare_build_dirs.py
pym/portage/util/__init__.py
pym/portage/util/_pty.py