Normalized the manner in which mysqladmin is invoked during mysql initialization
Merge branch 'master' of https://github.com/modestymaster/puppet-mysql

Conflicts:
	manifests/init.pp