Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 26 Jul 2010 15:22:24 +0000 (17:22 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 26 Jul 2010 15:22:24 +0000 (17:22 +0200)
commit5f1ce62c0fbff9cf475ec5d13f26a3cd8bc04eac
treee64b75d14d0b4cfc2c0a238c4a6a4b5aed8f65dc
parent6feea28a24ae222929aaa70886eaa096288a748f
parent0faca588d881865be6eafc9b6401124bb927bee5
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/dispatch-conf
bin/dispatch-conf
cnf/make.globals
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/const.py
pym/portage/dbapi/vartree.py
pym/portage/dispatch_conf.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/util/__init__.py