Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 9 Sep 2010 15:44:09 +0000 (17:44 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 9 Sep 2010 15:44:09 +0000 (17:44 +0200)
commite976f28f6068dd9a470e76c92f797fc68a8e49b0
tree8218f645da65304aca259634617ee4b579e2a0c9
parent48fd80309838739f06a714a61b6b4d8362363e7b
parent8381b7d50228d7a9dc2a8d4bf7b142e678c4e98e
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
runtests.sh
man/emerge.1
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/portage/util/__init__.py
runtests.sh