Merge commit 'v2.2.0_alpha72' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 2 Dec 2011 18:02:26 +0000 (19:02 +0100)
committerFabian Groffen <grobian@gentoo.org>
Fri, 2 Dec 2011 18:02:26 +0000 (19:02 +0100)
commitf5b5a26b7d729a93b784de29e438ad76b3e7c433
tree0407573f765b17ac466b9eb71c30253e11277c85
parent521d0f4a535c98867a8ed88f174cb2c74f57bb93
parent4cf9c9eb3d11fb653695c483d0013cba8b08039a
Merge commit 'v2.2.0_alpha72' into prefix

Conflicts:
bin/lock-helper.py
bin/xpak-helper.py
pym/_emerge/actions.py
pym/portage/__init__.py
25 files changed:
bin/ebuild
bin/egencache
bin/emaint
bin/glsa-check
bin/lock-helper.py
bin/portageq
bin/quickpkg
bin/regenworld
bin/repoman
bin/xpak-helper.py
man/emerge.1
man/make.conf.5
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/__init__.py
pym/portage/dbapi/bintree.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/_config/MaskManager.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/util/__init__.py
pym/portage/util/env_update.py
runtests.sh