Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Tue, 10 Jan 2012 17:33:16 +0000 (18:33 +0100)
committerFabian Groffen <grobian@gentoo.org>
Tue, 10 Jan 2012 17:33:16 +0000 (18:33 +0100)
commit4b881a4d55a20639caf2f89b2f9b7548446fd81e
treea604ebbd3fac69dc0fc982f8bfaa5b6e92a62d67
parent435e9c72e3e6f5f3596e75524c6f6892bb5e7ada
parentb7b0e36986a90311e671e23c8ad16e10bcbb860f
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild.sh
bin/phase-functions.sh
pym/portage/util/__init__.py
bin/ebuild.sh
bin/phase-functions.sh
bin/repoman
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/doebuild.py
pym/portage/util/__init__.py
pym/portage/util/env_update.py