Fix a missing colon
Merge pull request #101 from vikraman/fix/readme

Fix a missing colon
Merge pull request #102 from tampakrap/makeconf_list

Updates in portage::makeconf
Handle package version when a rebuild is triggered
Merge branch 'master' of git://github.com/walkamongus/puppet-portage into walkamongus-master

Conflicts:
	templates/makeconf.conf.erb
Merge branch 'fix/rebuild' of git://github.com/vikraman/puppet-portage into vikraman-fix/rebuild
Merge branch 'vikraman-fix/rebuild' into pebkac