From: Fabian Groffen Date: Sat, 13 Nov 2010 19:36:37 +0000 (+0100) Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5b7bfaf0eb80f28c21ca9a1e29464ac5a20d558f;p=portage.git Merge remote branch 'overlays-gentoo-org/master' into prefix Conflicts: pym/portage/dbapi/vartree.py --- 5b7bfaf0eb80f28c21ca9a1e29464ac5a20d558f