bump portage
Merge branch 'master' of github.com:tampakrap/puppet

Conflicts:
	modules/portage