Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 16 Oct 2011 13:59:20 +0000 (15:59 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sun, 16 Oct 2011 13:59:20 +0000 (15:59 +0200)
commitebcf640da49dc319ec3b642a1363726336cc36b6
tree604ca13e848e2e4933d6da569be9f96eb63769a8
parent80ec9bfcb756e9bb2ac1aa28b0f75aef0b97d7fb
parentc9e22480dbb1767cc0e59eee5c1c3b358da7a078
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
bin/ebuild
bin/fixpackages
bin/repoman
bin/ebuild
bin/egencache
bin/fixpackages
bin/repoman
pym/portage/package/ebuild/_config/special_env_vars.py
pym/portage/package/ebuild/config.py