Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Fri, 23 Apr 2010 19:17:15 +0000 (21:17 +0200)
committerFabian Groffen <grobian@gentoo.org>
Fri, 23 Apr 2010 19:17:15 +0000 (21:17 +0200)
commit80a2b2898552db45adc10e9380c1046904c3c36b
tree8f315b623862cadf7850d1f842457aefbd36f6b1
parent5ec7ffdfd1dd9a74592c400d7bf3efbae165393c
parentfa374d36e153171a9e8f674c1b866a93e8f51d8f
Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild-helpers/doinfo
bin/ebuild
bin/ebuild-helpers/doinfo
bin/ebuild-helpers/doman
pym/portage/tests/runTests