openssl and mysql
Merge branch 'master' of https://github.com/yujiyokoo/chef-repo

Conflicts:
	.gitmodules