Merge remote-tracking branch 'origin/h3-gentoo' into h2-gentoo
NEW: mail/aliases
Merge remote-tracking branch 'origin/h3-gentoo' into h2-gentoo

Conflicts:
	mail/aliases
minor
Merge remote-tracking branch 'origin/h6-gentoo' into h2-gentoo

Conflicts:
	conf.d/hostname
	conf.d/net
	fstab
	hosts
Merge remote-tracking branch 'origin/h2-gentoo' into h9-gentoo

Conflicts:
	conf.d/hostname
	conf.d/net
	fstab
	hosts
	portage/make.conf
	portage/package.use
Merge remote-tracking branch 'origin/h6-gentoo' into h9-gentoo

Conflicts:
	conf.d/hostname
	conf.d/net
	fstab
	hosts
	portage/make.conf
install cdm console display manager
minor
FIX: cdm start xfce via exec
cdm: add reboot and shutdown
minor
Merge remote-tracking branch 'origin/h9-gentoo' into h6-gentoo