modulefile
:Merge branch 'master' of github.com:zoide/puppet-ganglia

Conflicts:
	Modulefile
mysql metrics