From: Fabian Groffen Date: Sat, 31 Jul 2010 14:54:13 +0000 (+0200) Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1233f26a7163b6f155a8aeb0ed258f8b686bf535;p=portage.git Merge remote branch 'overlays-gentoo-org/master' into prefix Conflicts: pym/portage/_global_updates.py WORLD_FILE already includes EPREFIX (derived from PRIVATE_PATH), so no need to add EPREFIX to it again --- 1233f26a7163b6f155a8aeb0ed258f8b686bf535