Import phpmyadmin version 1.0.6
Import php version 1.4.4
Import xml version 1.2.2
Import mysql version 4.1.2
Merge branch 'chef-vendor-mysql'
Import chef_handler version 1.1.5
Merge branch 'chef-vendor-chef_handler'

Conflicts:
	cookbooks/iptables/CONTRIBUTING
	cookbooks/iptables/LICENSE