Import passenger_apache2 version 1.0.0
Import apache2 version 1.3.0
Import redis version 3.0.4
Import runit version 1.1.6
Merge branch 'chef-vendor-runit'
Import build-essential version 1.4.0
Merge branch 'chef-vendor-build-essential'
Import yum version 2.3.0
Import install_from version 3.0.4
Import metachef version 3.0.4
Import aws version 0.101.2
Merge branch 'chef-vendor-aws'
Import passenger version 0.0.1
Import passenger_apache2 version 2.0.2
Merge branch 'chef-vendor-passenger_apache2'
Import apache2 version 1.6.6
Merge branch 'chef-vendor-apache2'

Conflicts:
	apache2/attributes/default.rb
	apache2/definitions/apache_conf.rb
	apache2/definitions/apache_module.rb
	apache2/definitions/apache_site.rb
	apache2/definitions/web_app.rb
	apache2/metadata.rb
	apache2/recipes/vhost.rb
	apache2/templates/default/vhost.erb

* apache2/.gitignore:
Import logrotate version 1.2.2
Merge branch 'chef-vendor-logrotate'
fixing metadata for depends