Merge branch 'h3-gentoo' into h6-gentoo
NEW: portage: xkippy-xd
Merge branch 'h6-gentoo' into h3-gentoo