Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 11:38:02 +0000 (13:38 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 11:38:02 +0000 (13:38 +0200)
commitc40b0ab0d7913fe11603f1934ad68845d7c2dcf4
tree43e64b795e65d46bdfe9a67e2330107e3fbaf22d
parent107b27e2e4761c7261056f10603f2f35886f4d13
parent272eeb5809192984afeddfcdd10ae317accdfaf5
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/prepinfo
pym/portage/const.py
bin/ebuild-helpers/prepinfo
man/emerge.1
pym/_emerge/actions.py
pym/_emerge/depgraph.py
pym/_emerge/main.py
pym/portage/const.py
pym/portage/package/ebuild/fetch.py