etc/portage/make.conf etc/portage/package.use added
Merge branch 'master' into test