Import yum-mysql-community version 0.1.10
Import yum version 3.2.2
Import iptables version 0.13.2
Import logrotate version 1.6.0
Import pacman version 1.1.1
Import build-essential version 2.0.6
Import xml version 1.2.6
Import php-redis version 0.1.1
Deletion
Import mysql version 5.3.6
Merge branch 'chef-vendor-mysql'
Merge branch 'chef-vendor-yum-mysql-community'

Conflicts:
	cookbooks/build-essential/attributes/default.rb
	cookbooks/build-essential/recipes/_freebsd.rb
	cookbooks/build-essential/recipes/_mac_os_x.rb
	cookbooks/build-essential/recipes/_omnios.rb
	cookbooks/build-essential/recipes/_rhel.rb
	cookbooks/build-essential/recipes/_smartos.rb
	cookbooks/build-essential/recipes/_solaris2.rb
	cookbooks/build-essential/recipes/default.rb
	cookbooks/iptables/recipes/disabled.rb
	cookbooks/logrotate/attributes/default.rb
	cookbooks/logrotate/recipes/default.rb
	cookbooks/logrotate/recipes/global.rb
	cookbooks/pacman/recipes/default.rb
	cookbooks/pacman/resources/aur.rb
	cookbooks/pacman/resources/group.rb
	cookbooks/xml/attributes/default.rb
	cookbooks/yum/providers/globalconfig.rb