Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 7 Aug 2010 18:45:08 +0000 (20:45 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sat, 7 Aug 2010 18:45:08 +0000 (20:45 +0200)
commitd0e9a33e3a56644f41adc2ed67e9462d78fb0ae3
tree9726f04664d3640f6fd115f69b8399012946bfcd
parent0d79655afea9b6d4f403c293c8a98e010cc5c527
parent6dcb8b35d6bda91556ab5bb05d0666f71d207fc9
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/dispatch-conf
bin/ebuild.sh
bin/misc-functions.sh
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/config.py
13 files changed:
bin/dispatch-conf
bin/ebuild.sh
bin/misc-functions.sh
bin/quickpkg
bin/repoman
man/emerge.1
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/config.py
pym/portage/package/ebuild/doebuild.py
pym/portage/package/ebuild/fetch.py