Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 13:49:13 +0000 (15:49 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 13:49:13 +0000 (15:49 +0200)
commit1df19cd3f17ffc10edeb1263fe1687947338f5ad
treed2ec46cd93203b533e7d87f038939bc6f54849e5
parent9b41ebdae9fe1de1b3ccef290fc88ffdf20bd041
parent3baed89ca3e17d59f8e4b8a8453c88f26d0099d3
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/4/dodoc
bin/ebuild-helpers/4/dodoc
bin/ebuild-helpers/dodoc
bin/ebuild-helpers/prepalldocs