Merge branch 'master' of github.com:kdkk-/portage

Conflicts:
	net-misc/gfeedline/Manifest
Merge branch 'master' of github.com:kdkk-/portage