temp
Merge branch 'master' of github.com:perec007/mml

Conflicts:
	initservice.sh
	puppet/init_mysql.pp