made changes to make this ebuild more acceptable to sunrise
Merge branch 'master' of github.com:joe9/portage

Conflicts:
	app-shells/zsh-history-substring-search/ChangeLog
	app-shells/zsh-history-substring-search/Manifest