Merge remote-tracking branch 'origin/h3-gentoo' into h2-gentoo
portage: separate packages uses on server and desktop
Merge remote-tracking branch 'origin/h2-gentoo' into h3-gentoo

Conflicts:
	portage/package.use