Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Tue, 18 Jan 2011 18:59:58 +0000 (19:59 +0100)
committerFabian Groffen <grobian@gentoo.org>
Tue, 18 Jan 2011 18:59:58 +0000 (19:59 +0100)
commit25d0ae36d7339cd633b76d8e279a417462242c13
tree4e50c1556352674d07f45d796ec01d3b314986c7
parent2c4107ed0a45af278c013f9bf200c72f80129244
parent79e902e3f6ae9ba1331fc49a6ac7f36be2171f78
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts caused by copyright header change:
bin/ebuild
bin/egencache
bin/emerge
bin/portageq
bin/repoman
12 files changed:
bin/ebuild
bin/ebuild.sh
bin/egencache
bin/emerge
bin/emerge-webrsync
bin/portageq
bin/repoman
pym/_emerge/EbuildBuild.py
pym/_emerge/actions.py
pym/_emerge/main.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/doebuild.py