Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 30 Jan 2011 21:00:27 +0000 (22:00 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sun, 30 Jan 2011 21:00:27 +0000 (22:00 +0100)
commitf0d8fab0363aa1ebc1c5313140194f96dc0b0ea7
tree2e09930f24b44da963012775442eb3957ff3cc69
parent687059d4d6926aa74cd43d69ca75c3bc84da382e
parent8e1c57067c4556ee2c730f0722d344c52cf4888c
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
pym/_emerge/actions.py
pym/portage/dbapi/bintree.py
pym/_emerge/Package.py
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/portage/__init__.py
pym/portage/dbapi/bintree.py
pym/portage/package/ebuild/_config/MaskManager.py
pym/portage/package/ebuild/config.py