From: Fabian Groffen Date: Mon, 20 Sep 2010 15:20:35 +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=cdc87f479d460b84fafd6b81a4647bb8c9e095f8;p=portage.git Merge remote branch 'overlays-gentoo-org/master' into prefix Conflicts: pym/_emerge/RepoDisplay.py --- cdc87f479d460b84fafd6b81a4647bb8c9e095f8