Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Wed, 14 Jul 2010 16:23:54 +0000 (18:23 +0200)
committerFabian Groffen <grobian@gentoo.org>
Wed, 14 Jul 2010 16:23:54 +0000 (18:23 +0200)
commita79a4109d12cb515ea4144a1be25dc3ecb6cec34
tree83cf529850a27424708ea927f1d37cd677d7f4fc
parent807fbb504a3edba375f31d6ca80eec36b88bb1aa
parent3f14f5840f98630e9dbbf32ce45ac5fd6b565887
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/portage/data.py
pym/portage/package/ebuild/config.py
13 files changed:
bin/ebuild
bin/ebuild.sh
bin/isolated-functions.sh
bin/portageq
bin/repoman
cnf/make.globals
pym/_emerge/actions.py
pym/portage/__init__.py
pym/portage/const.py
pym/portage/data.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/util/__init__.py